cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 14:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,984 Commits 5 Branches 1 Tag
6393cb15d8f10833e899bad30812180424931b3d
Commit Graph

7183 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
4dc6028caf Merge pull request #5316 from Jarcolr/master 
Fixes #5283 and #5315
 2014-06-21 19:11:37 +09:30
DJSnapshot
ced6f13656 Removing automatic IPC whitelist in preparation for whitelisting and overhaul of IPCs. 2014-06-20 20:53:11 -07: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
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
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
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
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
Zuhayr
21be85445e Merge pull request #5303 from mwerezak/objectives 
Fixes a missing config check in autotraitor.dm
 2014-06-19 21:08:34 +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
0fbbd7f066 Merge pull request #5288 from laser50/patch-1 
Returns ..() on Microwaves
 2014-06-19 12:22:04 +04:00
mwerezak
cd971fb4ea Fixes a missing config check in autotraitor 
Also adds a config check to the various forge_* procs just to be sure.
 2014-06-19 00:01:47 -04:00
mwerezak
5006ebde14 Makes the supply shuttle process in a tighter loop 2014-06-18 21:24:57 -04: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