f6906addb2
Merge pull request #3285 from Steelpoint/JaniBelt
...
Adds the janibelt!
2014-04-04 08:10:21 -05:00
5626ad9bbc
Merge pull request #3275 from Aranclanos/TeleportersFix
...
Fixes and some minor changes regarding teleports/portals code.
2014-04-03 22:05:45 -07:00
47c463d0b2
Merge pull request #3276 from MrPerson/play_me_a_song_piano_man
...
Make violin stop cutting off other sounds
2014-04-03 20:26:58 +02:00
1f4ff7204c
More ALterations
2014-04-03 21:13:03 +08:00
23a7847705
Alterations
2014-04-03 21:12:09 +08:00
39196c6941
Merge pull request #3115 from Ikarrus/borgnotice
...
AIs are notified when a cyborg is slaved to it
2014-04-03 04:14:31 -07:00
f46cb302a4
Updated to work with newer cyborg code.
2014-04-02 22:12:36 -06:00
4dc2ccce1f
Merge pull request #3266 from phil235/FireAxeCabineFix
...
Fireaxe cabinet hacking now fails if player moves away
2014-04-02 21:26:37 -05:00
f705141fce
Resolved Conflicts:
...
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
af48fba65e
Merge pull request #3247 from Firecage/master
...
Mime Backpack
2014-04-02 20:26:16 +02:00
fc0f56a8c6
Merge pull request #3274 from Aranclanos/DermalPatch
...
Added back the dermal patch to the HoS locker.
2014-04-02 19:46:12 +02:00
58cbe6ff98
One more alteration
2014-04-03 01:42:25 +08:00
52a8aa3bfa
Whoops!
2014-04-03 01:33:22 +08:00
f45391a838
JaniBelt implementation
2014-04-03 01:30:02 +08:00
8e67b38e40
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-04-02 19:15:56 +02:00
e8d7526a0c
Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite
2014-04-02 17:11:52 +01:00
400971d32b
Merge pull request #3250 from MrStonedOne/powersink-admin-spam-fix
...
Fix for #3249 (Powersink is about to explode spam)
2014-04-02 15:53:43 +01:00
b700f39509
Merge pull request #3272 from Ikarrus/boxupdate
...
[MAP] "Boxstation" v2.1.3
2014-04-02 05:54:12 -07:00
19d00b96f0
Make violin stop cutting off other sounds
2014-04-02 05:23:00 -07:00
fc915bf800
If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
...
Fixes issue #2236 .
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
449c3655da
Added back the dermal patch to the HoS locker.
...
For some reason this item keeps getting stealth changes lately.
2014-04-02 04:50:16 -03:00
74b00b88c9
Merge pull request #3243 from GunHog/BLUE_AI_PRIV
...
Adds a name and light blue color to AI Private channel on the radio.
2014-04-01 18:53:29 -07:00
d58ee721dc
Changing user messages to use span class stuff.
2014-04-01 23:06:51 +02:00
06dcf22a49
Fireaxe cabinet hacking now fails if player moves away
...
Removes the ability to run away right after initializing the cabinet hacking with a multitool and still successfully finish the hacking(and seeing the hack message).
Also, playing the relocking sound at the beginning of the hacking instead of the end for consistency with the unlocking hack.
2014-04-01 22:04:08 +02:00
dabe951f56
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-04-01 12:09:26 +02:00
6c1150dca3
Merge pull request #3143 from Malkevin/saccult
...
Sacrifice Cult
2014-04-01 02:18:39 -03:00
bf3ad41e6d
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-04-01 06:45:10 +02:00
5fce1835b2
Merge pull request #3144 from Ikarrus/borgdebug
...
Debugging Cyborgs during Construction
2014-03-31 18:48:50 -05:00
6553980059
Fixes admin message spam, should only warn the admins once.
...
Fix for #3143
2014-03-31 14:42:47 -07:00
0725ba44a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
2014-03-31 22:17:24 +01:00
cd3773450b
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-03-31 20:56:34 +02:00
cccb3dcf76
Merge pull request #3226 from Giacom/syndicate_fab
...
Syndicate Suit Fashion
2014-03-31 19:35:45 +01:00
79797afb6a
Merge branch 'master' of git://github.com/tgstation/-tg-station.git
2014-03-31 18:53:02 +02:00
d1fbcf2457
Merge pull request #3227 from fleure/tankfix
...
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
af00fd14bf
Mimepack
...
This is a simple backpack for the mime.
2014-03-31 17:49:40 +02:00
f11294fdbf
Adds a name for AI Private in radio.dm.
2014-03-31 00:48:58 -05:00
2de4ffeb31
Committing what I have for now just in case. Also includes the new shuttle door type and added an airlock painter to the CE's closet.
2014-03-29 22:32:35 -06:00
c3552606f1
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/modules/mob/mob.dm
2014-03-29 16:59:14 +00:00
6cb3ae5183
Revert "Merge pull request #3142 from Alek2ander/master"
...
This reverts commit 6f9b58abceeda7110a23
2014-03-29 18:02:54 +04:00
79d255be20
Merge pull request #3203 from MrPerson/qdel_table
...
Make wrenching tables apart not drop the wrench
2014-03-29 06:24:23 -07:00
6f9b58abce
Merge pull request #3142 from Alek2ander/master
...
pAI remote computer control
2014-03-29 06:18:22 -07:00
96912ce8dc
Changed the replica suit/helmet to the black/red version.
...
Changed the description on the uplink datum.
Made all the suit/helmet names lowercase for all the different versions.
Changed the max_w_class to allow the suit to be inserted, won't allow anything else to be inserted due to the can_hold list not being empty.
2014-03-29 12:42:23 +00:00
c55ddd9d70
Watertank nozzles no longer delete
2014-03-29 12:35:58 +00:00
9fb84160c8
Replaced all the red syndicate space suits with the red/black version, including the uplink item. It looks cooler.
...
You can now put the syndicate suit back into the box it came in.
Gave the DJ Station the orange syndicate suit, looks very nice.
Replaced the syndicate suit in the derelict's singularity engine with the yellow/black engie version.
Replaced the other syndicate suit in the derelict with the red/black version.
Added a red/black space suit to the abandoned mining station, inside the resin corridor, along with a syndicate toolbox.
Moved the xeno suit to the hydro room, on the abandoned mining station. It looked out of place out in the open.
Moved the SWAT helmet on the derelict to the derelict armoury.
2014-03-29 12:00:23 +00:00
f2bfa3f5d4
Renamed maglite to seclite.
...
Refactor'd can_hold and cant_hold to use type paths instead of strings.
Removed an undefined object from the medical belt's can_hold list.
2014-03-29 11:10:35 +00:00
cc1d87afcf
Adds the maglite. Security spawns with it in their sec belts. They have a decent force value and are a little better than the common flashlight. Sprites by Nienhaus. Can be held in the sec belt and the armour vest.
2014-03-29 00:54:50 +00:00
3ff519cefc
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/modules/mob/mob.dm
2014-03-28 10:51:48 +00:00
3000586e7b
Merge pull request #3216 from Aranclanos/ClickDownRemoval2
...
Click cooldown removal take 2
2014-03-28 02:39:25 -07:00
7bcb69ad88
Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
...
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
febfa4d1e5
Merge branch 'qdel-with-datums'
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/controllers/garbage.dm
code/game/atoms.dm
code/game/objects/items/weapons/storage/storage.dm
code/modules/mob/mob.dm
2014-03-27 21:46:53 -04:00
Rockdtben
Razharas
Miauw62
Steelpoint
ikarrus
Cheridan
Firecage
Giacomand
fleure
MrPerson
Aranclanos
phil235
MrStonedOne
Malkevin
GunHog
Razharas
YotaXP