cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,937 Commits 6 Branches 0 Tags
0090efb21026c84ce846e3b3df11c607c20e8e0a
Commit Graph

4155 Commits

Author SHA1 Message Date
Zuhayr
ef277f1e6b Added extra bit of info to drone spawn. 2014-06-24 11:24:11 +09:30
Zuhayr
14bf0f064c Removed ability for drones to talk on Binary. 2014-06-24 11:23:59 +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
ece48ae0c4 Moved same code into single organ helper to handle embedding. 2014-06-24 04:09:35 +04:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +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
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
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10: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
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
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
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
d6022017c8 New vehicle loading code 
- Vehicles now load items on them somewhat like roller beds, allowing you to interact with them
 2014-06-21 14:13:25 +12:00
mwerezak
1b86e3548f Cleans up organ processing 2014-06-20 21:02:24 -04:00
mwerezak
cf5ff7e992 Body temperature fixes and updates 
Body temperature regulation is now based on species, and environmental
temperature now respects the air density when affecting living/humans.
This also fixes some bugs with heat/cold protection handling and
improves the way synthetic species body temperatures are handled to be
much more logical.

IPCs always gain temperature but cool down because of their environment.
When the heat transfer to the environment is reduced because of the lack
of air, this will cause IPCs to heat up.

As well, having an infection will increase your body temperature, and
body scanners now detect infections.
 2014-06-20 18:18:02 -04:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
mwerezak
032061522b Body temperature damage now uses species values 2014-06-20 13:37:07 -04:00
mwerezak
82a85c2bae Tweaks wound infection a bit 2014-06-19 23:48:49 -04:00
mwerezak
d512d62869 Re-enables organ infections, adds wound infection 2014-06-19 21:25:59 -04:00
mwerezak
9ef1216147 Updates l_move_time to use world.time 2014-06-19 18:11:39 -04:00
Zuhayr
ce69599a3a Whitelists diona nymphs. Forces them not to have universal_speak. 2014-06-19 08:48:58 +09:30
Zuhayr
8fa57539a5 Merge pull request #5295 from boopcat/happydrones 
fixes
 2014-06-19 08:23:13 +09:30
mwerezak
37b71c81fb Armour can turn sharp attacks into blunt ones 
Kind of messy, but I couldn't find another way to do it without
reworking a lot of the mob defence procs.
 2014-06-18 10:28:23 -04:00
mwerezak
5a3c7dc432 Fixes human/checkarmor getting the armour... 
...value for the wrong body part.

Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
 2014-06-18 10:05:04 -04:00
Boop
1b7acdb147 Fix runtime with brains and throwmode 2014-06-18 12:32:13 +01:00
mwerezak
0a394fb59f Fixes tails not rendering on the player preview 2014-06-18 00:27:07 -04:00
Zuhayr
342bee81d4 Merge pull request #5284 from boopcat/happydrones 
more fixes!
 2014-06-18 08:58:00 +09:30
Boop
a903e400dd Fixes #5088 
also fixes more runtimes that mloc gave me
 2014-06-17 20:35:48 +01:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
Chinsky
e304d0010d Merge pull request #5273 from boopcat/happydrones 
fixes!
 2014-06-17 14:43:55 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
mwerezak
944394a042 Fixes armour being applied to projectiles twice 2014-06-17 01:20:49 -04:00
mwerezak
72377d160f Fixes apply_damage ignoring species mods 
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
 2014-06-17 00:54:20 -04:00
mwerezak
274b03b083 Adds thrown object sharp and edge flags 2014-06-16 23:21:01 -04:00