Merge pull request #5990 from Poojawa/digileg-runtime

Hopefully crushes some runtimes
This commit is contained in:
deathride58
2018-03-20 15:26:43 +00:00
committed by GitHub
9 changed files with 88 additions and 88 deletions
@@ -254,6 +254,9 @@
if (!M.anchored && !M.pulledby && M.last_high_pressure_movement_air_cycle < SSair.times_fired)
M.experience_pressure_difference(pressure_difference, pressure_direction)
/turf/closed/proc/high_pressure_movements()
return
/atom/movable/var/pressure_resistance = 10
/atom/movable/var/last_high_pressure_movement_air_cycle = 0
+3
View File
@@ -1520,6 +1520,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if (!isnull(desiredfps))
clientfps = desiredfps
parent.fps = desiredfps
else
clientfps = 0
parent.fps = 0
if("ui")
var/pickedui = input(user, "Choose your UI style.", "Character Preference") as null|anything in list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Clockwork")
if(pickedui)
+1 -1
View File
@@ -140,7 +140,7 @@ Curator
l_hand = /obj/item/storage/bag/books
r_pocket = /obj/item/key/displaycase
l_pocket = /obj/item/device/laser_pointer
accessory = /obj/item/clothing/accessory/pocketprotector/full
//CITADEL EDIT removes runtimes from this pocket protector
backpack_contents = list(
/obj/item/melee/curator_whip = 1,
/obj/item/soapstone = 1,