cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,998 Commits 6 Branches 0 Tags
f2db8ed909999188ee232c11dba824f28ec9c26d
Commit Graph

13377 Commits

Author SHA1 Message Date
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
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
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
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
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
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
9e0d853e62 Merge pull request #5326 from comma/mlocisdumb 
optimize crew monitor's scan()
 2014-06-22 15:34:39 +01:00
Zuhayr
9f63bccd93 Merge pull request #5319 from DJSnapshot/hotfix 
Removing automatic IPC whitelist
 2014-06-23 00:00:55 +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
Chinsky
86db41a582 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Merge branch 'master' of https://github.com/Baystation12/Baystation12

Optimizes crew console scanning to only look for mobs instead of ALL clothing items in the world.
 2014-06-22 14:30:50 +04:00
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
5bd975850a Less terrible sprite for suit cooling device 
Also adds a few of them to EVA storage.
 2014-06-21 20:41:29 -04: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