a2a154aca9
Fixes for ( #3441 ).
2014-04-19 14:02:37 +02:00
f302adc8ab
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
2014-04-16 16:58:28 -07:00
440039f0a2
Merge pull request #3429 from Giacom/fix_manuals
...
Fixes manuals being unreadable.
2014-04-16 14:31:52 -05:00
5f5a470fe9
Merge branch 'master' of https://github.com/tgstation/-tg-station into steelpointcleanup
...
Resolved Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-04-15 21:10:00 -06:00
a8c5e2ea24
Merge pull request #3389 from Ikarrus/notifyfix
...
Fixed AI not being notified of new roboticist-built cyborgs slaved to it
2014-04-15 14:15:43 -05:00
3a6672b639
Fixes manuals being unreadable.
2014-04-15 18:37:48 +01:00
b800d97e3c
Changed execution chamber access to access_hos, removed bolt controls
2014-04-13 13:51:30 -06:00
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
13fa889b7f
Fixed AI not being notified of new roboticist-built cyborgs slaved to it
2014-04-09 20:55:36 -06:00
31cfe0ba80
Merge pull request #3378 from Donkie/jobrefactor
...
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
30bb6c8814
Generalised ID naming
2014-04-09 18:49:59 +02:00
6c668c7c7b
Generalised PDA naming
2014-04-09 18:43:29 +02:00
35950b90fd
SecMapChangeV3
2014-04-09 19:17:11 +08:00
f44e3ffbf1
Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
...
More qdel() changes
2014-04-08 15:37:44 -07:00
5abb553f4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
...
Conflicts:
code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
dd8891ef35
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14
...
Conflicts:
code/game/machinery/camera/camera.dm
2014-04-08 04:53:05 -07:00
bea449125b
Merge pull request #3354 from Ikarrus/doorelectronics
...
Updated the godawful Airlock Electronics interface
2014-04-08 01:44:37 -05:00
03b34893d5
Merge pull request #3343 from Giacom/small_fixes
...
Fixes being able to change your chameleon jumpsuit's colour while dead.
2014-04-07 18:48:05 -07:00
ac72bcaa37
Merge pull request #3283 from Aranclanos/Blueprints
...
Fixes blueprints not being able to generate a second area.
2014-04-07 18:36:36 -07:00
e58c90696a
Hopefully merge conflict fixes
2014-04-07 21:46:06 +10:00
f4c327ba26
Updated the godawful Airlock Electronics interface
...
Also added the ability to set if the door should require ALL listed accesses, or just one.
2014-04-06 15:04:31 -06:00
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
ce8baeabb9
Fixes being able to change your chameleon jumpsuit's colour while dead.
...
Fixed an oversight with the red syndicate suits in the random uplink kit.
2014-04-06 15:16:22 +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
53026a2483
Fixed the feedback messages for when you try to make a false wall with insufficient sheets.
...
Merged the open/close close from false walls walls and reinforced false walls into one.
2014-04-05 15:03:27 -03: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
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
3afde2e394
Fixes blueprints not being able to generate a second area.
...
Thanks to dosfox for the fix mentioned on the issue report.
Fisex issue #2327
2014-04-02 13:34:02 -03: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
Menshin
Ergovisavi
Cheridan
ikarrus
Giacomand
Jordie0608
Daniel
Steelpoint
Razharas
Miauw
MrPerson
iamgoofball
fleure
Aranclanos
Rockdtben
Firecage