810b91e7ac
removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists.
2014-04-06 11:46:12 -07:00
9db94d7c98
Merge pull request #3314 from Steelpoint/WaterTank
...
Increase's jani water tank's starting space cleaner supply
2014-04-06 17:16:06 +01:00
447bf56908
Merge pull request #3313 from Aranclanos/FalseWalls
...
Works with falsewalls and plasma asay logs.
2014-04-05 20:20:51 +02:00
f6906addb2
Merge pull request #3285 from Steelpoint/JaniBelt
...
Adds the janibelt!
2014-04-04 08:10:21 -05:00
3fe2530086
Fix
2014-04-04 21:06:30 +08:00
0f3acabbaa
AmountChange
2014-04-04 20:40:12 +08:00
7c93c1229f
Removed a spawn() from the Destroy() proc of falsewalls.
...
Removed the falserwall type, now reinforced walls are a subtype of falsewalls.
Due to that, removed a bunch of copypasted code.
Falsewalls now spawn closed.
Falsewalls open/close timers are now proper, regarding their animation times.
You can't use a screwdriver on falsewalls while they aren't on a floor. (excluding shuttle floors)
Fixes issue #2338
Plasma falsewalls will now ignite.
Added a feedback message when you don't have enough sheets to create a falsewall.
Admin logs for igniting plasma walls, falsewalls, doors and airlocks.
Stadarized mineral_doors.dm.
2014-04-04 09:18:39 -03: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
f46cb302a4
Updated to work with newer cyborg code.
2014-04-02 22:12:36 -06:00
f705141fce
Resolved Conflicts:
...
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06: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
19d00b96f0
Make violin stop cutting off other sounds
2014-04-02 05:23:00 -07: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
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
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
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
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
358ecf7e6a
Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master
...
Conflicts:
code/game/machinery/computer/computer.dm
code/game/machinery/computer/telecrystalconsoles.dm
2014-03-27 18:31:11 +04:00
cd6c1272ad
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
2014-03-27 13:18:46 +00:00
c41c80591a
Some minor fixes
2014-03-26 12:38:30 -06:00
990ed20873
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/modules/mob/mob.dm
2014-03-26 18:38:07 +00:00
e5f0165d0d
Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic
...
Conflicts:
code/datums/spells/charge.dm
code/modules/projectiles/ammunition/special.dm
code/modules/projectiles/guns/magic/staff.dm
2014-03-26 13:03:12 -04:00
fe8481331c
-Added option to force sync to a specific AI
...
-Removed option to force a module to load
-Fixed pulsing a cyborg's AI wire not letting it reselect an AI to sync to.
-Resolved Conflicts
2014-03-25 14:07:01 -06:00
9e9dc34ecf
Merge pull request #3163 from Mloc/tg-eol
...
proper crlf forcing
2014-03-24 22:47:13 -03:00
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
iamgoofball
fleure
Miauw62
Rockdtben
Steelpoint
Aranclanos
ikarrus
Firecage
Giacomand
MrPerson
Razharas
Cheridan
MrStonedOne
Malkevin
GunHog
Razharas
YotaXP
Alek2ander
Incoming
Mloc-Hibernia