cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10

Browse Source 
Polaris Sync 2018 01 10
This commit is contained in:
Arokha Sieyes
2018-01-16 02:46:25 -05:00
committed by GitHub
parent 8c6da18e19 5d5f052eb7
commit 0a037f0fe0
15 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/antagonist/station/infiltrator.dm
View File

@@ -1,4 +1,4 @@
// Infiltrator is a varient of Traitor, except that the traitors are in a team and can communicate with a special headset.
// Infiltrator is a variant of Traitor, except that the traitors are in a team and can communicate with a special headset.
var/datum/antagonist/traitor/infiltrator/infiltrators

4
code/game/gamemodes/technomancer/devices/hypos.dm
View File

@@ -86,7 +86,7 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity
name = "purity hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This varient excels at \
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \
resolving viruses, infections, radiation, and genetic maladies."
filled_reagents = list("spaceacillin" = 9, "arithrazine" = 5, "ryetalyn" = 1)
@@ -97,7 +97,7 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ
name = "organ hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. Organ damage is resolved by this varient."
desc = "A refined version of the standard autoinjector, allowing greater capacity. Organ damage is resolved by this variant."
filled_reagents = list("alkysine" = 1, "imidazoline" = 1, "peridaxon" = 13)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat

4
code/game/machinery/atmoalter/area_atmos_computer.dm
View File

@@ -16,8 +16,10 @@
/obj/machinery/computer/area_atmos/New()
..()
//So the scrubbers have time to spawn
desc += "[range] meters."
/obj/machinery/computer/area_atmos/initialize()
. = ..()
scanscrubbers()
/obj/machinery/computer/area_atmos/attack_ai(var/mob/user as mob)

13
code/game/machinery/cryo.dm
View File

@@ -30,16 +30,9 @@
var/turf/T = src.loc
T.contents += contents
if(beaker)
beaker.loc = get_step(src.loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
..()
/obj/machinery/atmospherics/unary/cryo_cell/initialize()
if(node) return
var/node_connect = dir
for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
if(target.initialize_directions & get_dir(target,src))
node = target
break
beaker.forceMove(get_step(loc, SOUTH)) //Beaker is carefully ejected from the wreckage of the cryotube
beaker = null
. = ..()
/obj/machinery/atmospherics/unary/cryo_cell/process()
..()

2
code/game/machinery/portable_turret.dm
View File

@@ -81,7 +81,7 @@
/obj/machinery/porta_turret/ai_defense
name = "defense turret"
desc = "This varient appears to be much more durable."
desc = "This variant appears to be much more durable."
installation = /obj/item/weapon/gun/energy/xray // For the armor pen.
health = 250 // Since lasers do 40 each.
maxhealth = 250

2
code/game/objects/structures/loot_piles.dm
View File

@@ -6,7 +6,7 @@ If that roll fails, they do one final roll, using chance_uncommon. If they succ
If that fails again, they walk away with some common junk.
The same player cannot roll again, however other players can. This has two benefits. The first benefit is that someone raiding all of
maintenance will not deprive other people from a shot at loot, and that for the surface varients, it quietly encourages bringing along
maintenance will not deprive other people from a shot at loot, and that for the surface variants, it quietly encourages bringing along
buddies, to get more chances at getting cool things instead of someone going solo to hoard all the stuff.
Loot piles can be depleted, if loot_depleted is turned on. Note that players who searched the pile already won't deplete the loot furthers when searching again.