cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,968 Commits 74 Branches 23 Tags
db248dbd845c868a238ddc240654cc7106f09e5b
Commit Graph

13351 Commits

Author SHA1 Message Date
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
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
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
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
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
Zuhayr
4dc6028caf Merge pull request #5316 from Jarcolr/master 
Fixes #5283 and #5315
 2014-06-21 19:11:37 +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
Chinsky
b7832f862a Fixes #5311 2014-06-21 00:58:31 +04:00
Jarcolr
90e08a15b3 Fixes #5283 and #5315 
All it took was some fancy switches.
 2014-06-20 23:20:45 +03:00
mwerezak
032061522b Body temperature damage now uses species values 2014-06-20 13:37:07 -04:00
Zuhayr
33fa88e27a Merge pull request #5309 from mwerezak/flashbang 
Fixes #5186
 2014-06-20 21:23:34 +09:30
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
25e333a39b Fixes #5186 2014-06-20 02:48:12 -04:00
Chinsky
6f6cf57a93 Merge pull request #5277 from Jarcolr/dev 
Adds paths for therapy dolls from #2731
 2014-06-20 09:02:03 +04:00