mwerezak
abcba2c725
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
2014-06-24 17:49:20 -04:00
Zuhayr
5c002d3701
Changed cryo message a bit.
2014-06-24 21:18:47 +09:30
Zuhayr
4e673d047e
Merge branch 'spawnpoints' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-24 19:22:18 +09:30
Chinsky
4da1a5302e
Merge pull request #5354 from Zuhayr/cattes
...
Made cats pickupable.
2014-06-24 13:12:01 +04:00
Chinsky
8c67326576
Merge pull request #5331 from UristMcKerman/pipeturbine
...
Pipe Turbine
2014-06-24 13:08:11 +04:00
Chinsky
d96a901ea0
Merge pull request #5342 from Zuhayr/dev
...
Allows climbing onto tables and crates, also adds falling off if you are...
2014-06-24 13:05:17 +04:00
Zuhayr
b67bb6470d
Made cats pick-up-able.
2014-06-24 14:41:08 +09:30
Zuhayr
2262661549
Ravensdale thinks the gateway has lore problems, commenting it out of spawn.
2014-06-24 14:03:11 +09:30
DJSnapshot
f2db8ed909
Merge pull request #5344 from Hubblenaut/dev
...
Moves the non-implanted security positions from restricted to protected ...
2014-06-23 21:22:59 -07:00
DJSnapshot
93ccad2a82
Merge pull request #5343 from Mloc/bs12-burn
...
Fire buffs, wall damage
2014-06-23 21:22:32 -07:00
Zuhayr
df99c59389
Removed pointless option on cryopod.
2014-06-24 13:44:52 +09:30
Zuhayr
abc07e435c
Minor formatting fix.
2014-06-24 13:41:59 +09:30
mwerezak
25bcdfa39e
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-24 00:09:17 -04:00
Zuhayr
96bbe1d9db
Added spawnpoint datum, moved existing latejoin spawn to datum setup.
2014-06-24 13:33:48 +09:30
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
Zuhayr
a5c2af7a57
Shuffling around table and crate knock/climb procs.
2014-06-24 11:11:02 +09:30
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
Hubblenaut
4868c7337c
Moves the non-implanted security positions from restricted to protected list, adds IA Agent to restricted.
2014-06-24 00:12:58 +02:00
Zuhayr
7fe8a89e58
Makes table/crate falling a bit more dangerous.
2014-06-24 07:17:24 +09:30
Mloc-Argent
1aca3fe7f2
atmos: make fires more destructive
...
Fires can now burn through walls, windows, and (with a high enough
temperature) rwalls.
New proc: adjacent_fire_act(). Called on turfs that a fire isn't able
to spread to. (walls, floor surrounded by windows, etc.)
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-23 20:58:14 +01:00
Mloc-Argent
6d0098c4fb
turf: adds a damage model for walls
...
New proc for walls: take_damage().
Damage is tracked in the "damage" var, walls will break if "damage"
hits "damage_cap".
Damage can be repaired with a weldingtool.
Damage overlays are cached in the global wall var "damage_overlays"
to reduce overhead.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-23 20:58:12 +01:00
Mloc-Argent
da89c36cde
atmos: fix a geometry error
...
reverse_dir is a list of reversed dir fields
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-23 20:58:10 +01:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
Zuhayr
8fe013d531
Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened.
2014-06-24 03:21:27 +09:30
mwerezak
6b3c130702
Removes dynamic proc call
2014-06-23 10:55:03 -04: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
b0cc1f6789
Forgot to process shuttles
2014-06-22 18:36:43 -04:00
mwerezak
caece105dc
Adds escape pods to the controller
2014-06-22 18:19:07 -04:00
mwerezak
e1d495b9ea
Fix for supply controller update
2014-06-22 18:11:10 -04:00
mwerezak
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
Zuhayr
de88ed4fab
Merge pull request #5329 from comma/dev
...
mastere -> dev merge and a fix
2014-06-23 05:46:51 +09:30
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
2cc80a0694
Fix for a runtime.
2014-06-22 22:17:56 +04:00
