cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-18 01:27:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,969 Commits 9 Branches 26 Tags
d8ef1647a733f2e1fed1deaef6741e81a08cb1a3
Commit Graph
7757 Commits
Author SHA1 Message Date
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
mwerezak 5305de5ecb Fixed misplaced prob(), added notes 2014-06-22 09:51:38 -04:00
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 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 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
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
Ccomp5950 68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05: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
Chinsky 78142a7cc2 Merge pull request #5276 from caelaislinn/xenoarchaeology 
Xenoarchaeology
 2014-06-20 14:41:25 +04:00
Cael Aislinn 22cc2558ff switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 18:42:38 +10:00
Cael Aislinn f02e6fdd45 rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 18:42:25 +10:00
mwerezak ffbad1ef15 Spaceacillin cures infected organs 2014-06-19 23:49:23 -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
Hubblenaut 8a4739197e Merge branch 'backup' into medical 2014-06-19 15:36:28 +02:00
Mloc a00128c0ad Merge pull request #5280 from comma/virus-racism 
Diskette size change
 2014-06-19 14:21:19 +01:00
Chinsky f7e14c8f99 Merge pull request #5282 from Jarcolr/master 
Partially fixes #5255 and walking over asteroid edges
 2014-06-19 17:03:06 +04:00
Zuhayr 39acf41328 Merge pull request #5293 from mwerezak/armour 
Allows armour to turn sharp attacks into blunt attacks with some probability
 2014-06-19 21:08:39 +09:30
Zuhayr 69d25ea048 Merge pull request #5301 from mwerezak/cargo-shuttle2 
Docking Controllers Stage 3: Cargo Shuttle
 2014-06-19 21:08:29 +09:30
Chinsky b2337d0c51 Merge pull request #5289 from laser50/patch-2 
Adds ..() on Chem Masters
 2014-06-19 12:21:58 +04:00
Cael Aislinn ad35bf3262 harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 15:41:35 +10:00
Cael Aislinn fc99c5b65f miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks: 
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 13:52:21 +10:00
mwerezak c28fd0ecb5 Adds supply shuttle docking controllers 2014-06-18 21:25:17 -04:00
mwerezak 5006ebde14 Makes the supply shuttle process in a tighter loop 2014-06-18 21:24:57 -04:00
Cael Aislinn f3ab8b0748 moved xenoarchaeology master controller code into a separate file 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:07:12 +10:00
Cael Aislinn 0e1c367012 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:06:20 +10:00
Cael Aislinn 6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology 
Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 10:05:27 +10:00
mwerezak e46c3c8834 Renames supply controller global var 
Renamed from 'supply_shuttle' to 'supply_controller'
 2014-06-18 19:37:46 -04:00
mwerezak 462593f0b5 Adds supply shuttle datum 2014-06-18 19:37:30 -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
Hubblenaut 5e8a82bb0a Fixes text color in advanced trauma kit surgery step 2014-06-18 23:11:01 +02:00