LordJike
12ac7e2a00
Update deep_fryer.dm
2017-03-01 19:26:28 -04:00
Fox McCloud
33b7213065
Merge pull request #6613 from Crazylemon64/autopsy_data
...
Adds stuff to autopsy
2017-03-01 18:23:11 -05:00
Fox McCloud
3ec0afeecf
Merge pull request #6639 from KasparoVy/multivox-plasmaverse
...
Properly Equips Plasmaman & Vox Multiverse Copies
2017-03-01 18:22:09 -05:00
Fox McCloud
eb7edab605
Merge pull request #6364 from Aurorablade/NerfsPowerNaps
...
Stop Dashing Waves
2017-03-01 18:21:21 -05:00
Tigercat2000
c3bcd15c5e
fix nukeops
2017-03-01 14:44:09 -08:00
Fox McCloud
58201f87d3
Merge pull request #6638 from gt33/patch-1
...
Fixes the Mime's EVA Suit description
2017-03-01 04:41:25 -05:00
Fox McCloud
4f373a8fb0
Merge pull request #6616 from Crazylemon64/spacevine_loot
...
Encourages crew to foster highly dangerous biothreats
2017-03-01 04:40:59 -05:00
Fox McCloud
1cbabb40cb
Merge pull request #6627 from SamHPurp/Adds-Wood-to-Cargo
...
Allows Cargo to order Wood Planks
2017-03-01 04:40:07 -05:00
KasparoVy
88669090a6
Properly Equips Plasmaman & Vox Multiverse Copies
2017-02-28 04:37:10 -05:00
gt33
0f1b2b599d
Fixes the Mime's EVA Suit description
2017-02-28 04:27:36 -05:00
KasparoVy
f425f0ae4e
Plasmaman Suit only extinguishes when you're on fire.
...
Had to make it disregard negative firestacks because showers (and
probably some other things). This check is extremely similar to one just
a few lines above, so it makes sense.
2017-02-28 00:50:03 -05:00
Fox McCloud
1634788ba5
Merge pull request #6635 from Krausus/ClickSubstituteTweaks
...
[s].click Substitute Tweaks
2017-02-28 00:21:28 -05:00
Fox McCloud
45286f3a7f
Merge pull request #6634 from Crazylemon64/airlock_runtime_fix
...
Fixes roundstart airlock runtime
2017-02-28 00:19:48 -05:00
Crazylemon64
31679e729f
Fixes roundstart airlock runtime
2017-02-27 20:06:34 -08:00
Krausus
18ba27fd70
Click substitute tweaks
2017-02-27 23:04:55 -05:00
FlattestGuitar
8d4127c80d
Disables the .click macro
2017-02-27 23:07:25 +01:00
Sam
a59cc3c15f
adds wood planks to Cargo ordering
...
Only 30, and 15 points, which is more expensive than metal. Wood in
space is rare!
2017-02-27 12:37:18 +00:00
uraniummeltdown
d0d2c63f30
remove trailing returns, alter checks, setdir, light_range
2017-02-27 15:03:28 +04:00
uraniummeltdown
0c7ec9d330
Merge remote-tracking branch 'remotes/upstream/master' into statues
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-27 14:27:24 +04:00
Fox McCloud
cdf5b55ac1
Merge pull request #6535 from KasparoVy/rigfix
...
Fixes Rigsuit NODROP-Related Bug and Improves Rigsuit Verb Readability
2017-02-26 18:04:51 -05:00
Krausus
32df184a47
Fixes religious choices blocking round startup
2017-02-26 17:48:39 -05:00
Fox McCloud
8729dff99e
Merge pull request #6588 from Crazylemon64/random_barrier
...
Adds a random barrier for use in mapping
2017-02-26 17:27:20 -05:00
Crazylemon64
31417488c4
Adds hooks in Adjust*Loss to support autopsy
2017-02-26 09:43:00 -08:00
Crazy Lemon
e6e3ebd462
Merge pull request #6599 from davipatury/datacore-effect
...
Refactors datacore into a datum
2017-02-26 09:38:56 -08:00
Fox McCloud
21941f4547
Merge pull request #6566 from Kyep/aiupload_zlevel_restrict
...
Stops AI & Borg upload consoles working on other zlevels
2017-02-26 12:35:17 -05:00
Fox McCloud
116d852d60
Merge pull request #6587 from Crazylemon64/immovable_rod_is_finite
...
Immovable rods no longer loop forever
2017-02-26 12:08:28 -05:00
Fox McCloud
5772b6170b
Merge pull request #6618 from Crazylemon64/firedoor_robofix
...
Robots can now work with firelocks again
2017-02-26 11:56:36 -05:00
Crazylemon64
d43c921b68
Fixes barber and captain equipment
2017-02-26 07:32:12 -08:00
Crazylemon64
923b5b160b
Should prevent false-alarm rod events
2017-02-26 07:26:07 -08:00
Crazylemon64
fb88011dcd
Robots can now work with firelocks again
2017-02-26 07:19:12 -08:00
Crazylemon64
d494eee903
Encourages crew to foster highly dangerous biothreats
2017-02-26 05:12:04 -08:00
Kyep
c4e7d346bd
Crazy request
2017-02-26 04:59:04 -08:00
Crazylemon64
c0ae16c695
Electrocution is now tracked in autopsy
2017-02-26 00:03:15 -08:00
Crazy Lemon
21eaf98684
Merge pull request #6481 from davipatury/atm-ui
...
ATM Nano-UI-ification
2017-02-25 22:43:36 -08:00
Crazy Lemon
3f36c99bad
Merge pull request #6606 from Kyep/mentor_verb_bugfix
...
Fixes spam when mentors check playtime/playerage
2017-02-25 22:38:13 -08:00
Aurorablade
414f83bb98
Krasues Tweaks
2017-02-25 23:45:15 -05:00
Kyep
04de186145
Loadout system bugfix
...
🆑 Kyep
bugfix: players will no longer spawn with loadout items their job has no
access to. /🆑
2017-02-25 18:53:08 -08:00
Kyep
92e21bffcc
Fixes spam when mentors check playtime/playerage
2017-02-25 18:47:02 -08:00
Crazy Lemon
186edb14e7
Merge pull request #6468 from tigercat2000/job_refactor_tg
...
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
davipatury
97b9e17955
Datacore refactor.
2017-02-25 22:31:19 -03:00
Crazy Lemon
992fae8cf5
Merge pull request #6500 from davipatury/secure_data-ui
...
Security Records Nano-UI-ification
2017-02-25 16:59:59 -08:00
Fox McCloud
1e44336a3a
Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
...
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Fox McCloud
616a0ff8d1
Merge pull request #6446 from Kyep/terrorspiders-PR3
...
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Fox McCloud
ec30a8b629
Merge pull request #6580 from Draconic-saint/spartan_fluff
...
Spartan fluff
2017-02-25 16:50:28 -05:00
Kyep
6fac5bcc98
Tiger changes
2017-02-25 06:06:51 -08:00
Tigercat2000
fe5fb2c0f8
Merge remote-tracking branch 'upstream/master' into job_refactor_tg
2017-02-25 05:42:47 -08:00
davipatury
26d5a016f0
The same error in two pull requests.
2017-02-25 09:56:27 -03:00
Fox McCloud
fbed82b080
Merge pull request #6570 from SamHPurp/no-ghost-spin
...
Refactors the Chair Rotate verb
2017-02-25 06:51:57 -05:00
Sam
83e616d8d8
Removes a superfluous return
...
Hopefully the final change..
2017-02-25 09:08:41 +00:00
Aurorablade
3a89c685bf
Tweak per suggestion.
2017-02-25 02:04:00 -05:00
