mwerezak
25bcdfa39e
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-24 00:09:17 -04:00
mwerezak
d892099ea3
Adds direction arg for area/move_contents_to()
...
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
mwerezak
ebacf05acf
Fixes escape shuttle not transitioning
2014-06-23 23:50:49 -04:00
Zuhayr
b63708577b
Merge pull request #5345 from comma/monkey_revenge
...
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 11:41:33 +09:30
mwerezak
e17b8bffab
Replaces the emergency shuttle control console
...
Replaces the old emergency shuttle control console with a nice new
NanoUI one. Improves the NanoUI for the docking controllers.
2014-06-23 22:01:21 -04:00
mwerezak
9e0562b16c
Adds shuttle controller
...
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
Chinsky
6393cb15d8
Merge pull request #5332 from mwerezak/wound-infections
...
Gives the suit coolers a proper process() proc
2014-06-24 05:32:47 +04:00
Chinsky
4cd4217488
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
...
Conflicts:
code/modules/organs/organ_external.dm
2014-06-24 04:22:28 +04:00
Chinsky
3ff6c41846
Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
...
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
2014-06-24 04:19:09 +04:00
Chinsky
ece48ae0c4
Moved same code into single organ helper to handle embedding.
2014-06-24 04:09:35 +04:00
Chinsky
b2b9907605
Lowers caused damage to make it destroy organs rarer.
2014-06-24 03:56:34 +04:00
Chinsky
e3930fa79e
Monkey cube now expand when eaten, leading to !!FUN!!
2014-06-24 03:42:23 +04:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
Mloc
db248dbd84
Merge pull request #5335 from Loganbacca/trainfix
...
Cargo train update
2014-06-23 14:03:11 +01:00
Mloc
8ca382f362
Merge pull request #5338 from Loganbacca/devfix
...
Fixes incorrect cable coil colours
2014-06-23 14:02:46 +01:00
Zuhayr
a6f64ccd9c
Merge pull request #5330 from mwerezak/emergency-shuttle
...
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
Loganbacca
d1a729f5db
Fixes incorrect cable coil colours
2014-06-23 21:44:51 +12:00
Loganbacca
3aa3c4166c
Cargo train update
...
- Cleans up some old code
- Fixes some bugs
- Adds keys to start the engine
2014-06-23 19:53:58 +12:00
mwerezak
e225661c2c
Fixes #5193
2014-06-23 02:53:09 -04:00
mwerezak
67d5d56a12
Gives the suit coolers a proper process() proc
2014-06-23 02:31:36 -04:00
mwerezak
81f0f868b4
Minor shuttle fixes and cleanup
...
Readds the missing "shuttle has left the station" message, improves the
ETA calculation and reorganizes the procs in shuttle_controller.dm
2014-06-23 01:55:43 -04:00
mwerezak
71351bd285
Some fixes
2014-06-22 20:40:08 -04:00
mwerezak
caece105dc
Adds escape pods to the controller
2014-06-22 18:19:07 -04:00
mwerezak
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
mwerezak
1c91b2984d
Supply controller now holds a ref to it's shuttle
...
Instead of having to look it up every time.
2014-06-22 14:18:52 -04:00
Chinsky
7e56df8689
Merge pull request #5308 from mwerezak/wound-infections
...
Re-enables infections, implements a wound infection system, improves body temperatures
2014-06-22 22:04:25 +04:00
Zuhayr
65013ac5a1
Merge pull request #5325 from mwerezak/temperature-expose
...
Fixes FEA temperature_expose() being used instead of ZAS fire_act().
2014-06-23 00:19:15 +09:30
Mloc-Argent
191e21ead6
atmos: fix everlasting fires
...
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-22 15:25:23 +01:00
mwerezak
5305de5ecb
Fixed misplaced prob(), added notes
2014-06-22 09:51:38 -04:00
Zuhayr
8e6c12a405
Merge pull request #5324 from Loganbacca/bayfix
...
Preview icon render fix
2014-06-22 22:13:17 +09:30
Zuhayr
1cfb9b6ea1
Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-22 21:58:46 +09:30
Zuhayr
183ee20ab6
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-06-22 21:58:30 +09:30
Zuhayr
bb8951a53c
Makes forks usable.
2014-06-22 21:49:55 +09:30
Mloc
af60005aad
Merge pull request #5317 from comma/master
...
Couple o fixes
2014-06-22 11:13:29 +01:00
mwerezak
37e63dfcb0
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
Loganbacca
63f9b93ab0
Preview icon render fix
...
- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
2014-06-22 13:05:41 +12:00
mwerezak
c5d14da602
Fixes pressure and temperature damage for autopsies
2014-06-21 20:38:50 -04:00
mwerezak
7500275c41
Fixes bad capitalization in proc call
2014-06-21 17:07:38 -04:00
mwerezak
9528557573
IPCs actually take heat damage from temperature now
...
Also fixes the healthanalyzer still not scanning IPCs properly (scanning
them when it shouldn't)
2014-06-21 16:58:20 -04:00
mwerezak
1a57ed7355
Having an infection raises your body temperature
...
Also the toxin damage taken during INFECTION_LEVEL_ONE is greatly
reduced.
Fixes robotic internal organs getting infections.
Fixes the organ_failure random event. Forgot to set the affected organ
as needing processing.
2014-06-21 16:55:07 -04:00
mwerezak
b9fa433087
Adds suit cooling device
...
Also:
Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
2014-06-21 16:53:18 -04:00
mwerezak
1a74db2110
Merge remote-tracking branch 'upstream/dev' into train-cleanup
...
Resolved merge conflicts, and added some more user feedback to attach/unattach procs.
Conflicts:
code/modules/vehicles/cargo_train.dm
2014-06-21 11:29:10 -04:00
mwerezak
0c060d144b
IPCs now need to be scanned with a robotanalyzer
2014-06-21 11:08:09 -04:00
Chinsky
a5ae759703
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-06-21 19:02:20 +04:00
Chinsky
15536d27a4
Fixes #5264
...
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.
2014-06-21 17:52:59 +04:00
Zuhayr
baeca85704
Merge pull request #5321 from mwerezak/diona-lang
...
Fixes #5299
2014-06-21 19:11:50 +09:30
mwerezak
3f9fbc680b
Fixes #5299
2014-06-21 02:07:47 -04:00
Loganbacca
f0c32f4d23
Vehicle layer tweak
2014-06-21 17:56:07 +12:00
mwerezak
2737171337
Cleans up train latching/unlatching
...
Also adds a verb for turning off train engines.
2014-06-21 01:30:40 -04:00
mwerezak
244b43c657
Infections now spread between organs
...
Infections can now spread between internal and external organs.
Also changes the organ_failure random event to cause an infection
instead.
2014-06-20 23:22:03 -04:00
