cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Branded IPCs (#3388)

Browse Source 
This PR adds 2 subtypes of industrial and two subtypes of baseline, one for each cybernetics manufacturer. Sprites by BRAINOS.

other changes:

IPCs can now be flashed or flashbanged.
Admin spawn paths have been added for subspecies that did not have them.
IPCs are no longer slowed by being cold.
This commit is contained in:
Lohikar
2018-01-21 00:34:06 +02:00
committed by Erki
parent 7086e77207
commit 90886a3076
48 changed files with 585 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flash.dm
+3 -3
View File
@@ -76,7 +76,7 @@
M.eye_blind = 5
return
var/safety = M:eyecheck()
var/safety = M:eyecheck(TRUE)
if(safety <= 0)
M.Weaken(10)
flick("e_flash", M.flash)
@@ -194,7 +194,7 @@
for(var/obj/item/weapon/cloaking_device/S in M)
S.active = 0
S.icon_state = "shield0"
var/safety = M.eyecheck()
var/safety = M.eyecheck(TRUE)
if(safety < FLASH_PROTECTION_MODERATE)
if(!M.blinded)
flick("flash", M.flash)
@@ -213,7 +213,7 @@
times_used++
if(istype(loc, /mob/living/carbon))
var/mob/living/carbon/M = loc
var/safety = M.eyecheck()
var/safety = M.eyecheck(TRUE)
if(safety < FLASH_PROTECTION_MODERATE)
M.Weaken(10)
flick("e_flash", M.flash)
code/game/objects/items/devices/suit_cooling.dm
+4 -4
View File
@@ -57,7 +57,7 @@
var/mob/living/carbon/human/H = loc
var/efficiency = 1 - H.get_pressure_weakness() //you need to have a good seal for effective cooling
var/efficiency = !!(H.species.flags & ACCEPTS_COOLER) || 1 - H.get_pressure_weakness() //you need to have a good seal for effective cooling; some species can directly connect to the cooler, so get a free 100% efficiency here
var/env_temp = get_environment_temperature() //wont save you from a fire
var/temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling)
@@ -205,9 +205,9 @@
if (on)
if (attached_to_suit(src.loc))
user << "It's switched on and running."
else if (istype(src.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src.loc
if (global.mechanical_species[H.get_species()] == MECHANICAL_SPECIES_INDUSTRIAL)
else if (ishuman(loc))
var/mob/living/carbon/human/H = loc
if (H.species.flags & ACCEPTS_COOLER)
user << "It's switched on and running, connected to the cooling systems of [H]."
else
user << "It's switched on, but not attached to anything."