From b22e1a1cb475edf7f654d9ae1bd03c429f7e3d10 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 16 Jan 2020 02:27:35 -0700 Subject: [PATCH] compile --- code/__HELPERS/time.dm | 3 +++ code/datums/brain_damage/severe.dm | 2 +- code/game/machinery/pipe/pipe_dispenser.dm | 3 ++- code/game/mecha/mecha.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 3 +-- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/alien/alien_defense.dm | 2 +- code/modules/mob/living/silicon/robot/robot_defense.dm | 2 +- code/modules/mob/living/simple_animal/friendly/cat.dm | 4 ++-- code/modules/mob/living/status_procs.dm | 2 +- code/modules/vehicles/cars/car.dm | 4 ++-- modular_citadel/code/datums/status_effects/chems.dm | 2 +- 12 files changed, 17 insertions(+), 14 deletions(-) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index f0d5a7b252..1cb16b9a79 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -81,3 +81,6 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0) if(!wtime) wtime = world.time return time2text(wtime - GLOB.timezoneOffset, format) + +/proc/station_time_timestamp(format = "hh:mm:ss", wtime) + return time2text(station_time(TRUE, wtime), format) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 0e08c4cd15..1bd27ed583 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -132,7 +132,7 @@ /datum/brain_trauma/severe/narcolepsy/on_life() ..() - if(owner.IsSleeping()) + if(owner._REFACTORING_IsSleeping()) return var/sleep_chance = 1 if(owner.m_intent == MOVE_INTENT_RUN) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 25a41b9f94..49c50c96b3 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -34,7 +34,8 @@ /obj/machinery/pipedispenser/Topic(href, href_list) if(..()) return 1 - if(!anchored|| !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + var/mob/living/L = usr + if(!anchored || !istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE)) usr << browse(null, "window=pipedispenser") return 1 usr.set_machine(src) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 7f62e76c3f..53cc18ff03 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -750,7 +750,7 @@ AI.cancel_camera() AI.controlled_mech = src AI.remote_control = src - AI.mobility_flags = MOBILITY_FLAG_DEFAULT //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow. + AI.mobility_flags = MOBILITY_FLAGS_DEFAULT //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow. AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES. to_chat(AI, AI.can_dominate_mechs ? "Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!" :\ "You have been uploaded to a mech's onboard computer.") diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index ac4f3e1d49..e2fdb66ecf 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -356,8 +356,7 @@ forceMove(O) O.robot_suit = src if(!locomotion) - O.locked_down = TRUE - O.update_canmove() + O.SetLockdown(TRUE) else if(istype(W, /obj/item/pen)) to_chat(user, "You need to use a multitool to name [src]!") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 0846cf1ea1..7e5ce3f04f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -11,7 +11,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) layer = GHOST_LAYER stat = DEAD density = FALSE - canmove = 0 + mobility_flags = NONE anchored = TRUE // don't get pushed around see_invisible = SEE_INVISIBLE_OBSERVER see_in_dark = 100 diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index dc6d3a36fb..bc46608f07 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -26,7 +26,7 @@ In all, this is a lot like the monkey code. /N AdjustAllImmobility(-60, FALSE) AdjustUnconscious(-60, FALSE) AdjustSleeping(-100, FALSE) - update_mobililty() + update_mobility() visible_message("[M.name] nuzzles [src] trying to wake [p_them()] up!") if(INTENT_DISARM, INTENT_HARM) if(health > 0) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 259e2ac953..d45feff48b 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -136,7 +136,7 @@ /mob/living/silicon/robot/proc/beep_boop_rogue_bot(mob/user) SetEmagged(1) - SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown + _REFACTORING_SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown lawupdate = 0 connected_ai = null message_admins("[ADMIN_LOOKUPFLW(user)] emagged cyborg [ADMIN_LOOKUPFLW(src)]. Laws overridden.") diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index c6f5443965..2cde5894a5 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -38,8 +38,8 @@ . = ..() verbs += /mob/living/proc/lay_down -/mob/living/simple_animal/pet/cat/update_canmove() - ..() +/mob/living/simple_animal/pet/cat/update_mobility() + . = ..() if(client && stat != DEAD) if(!CHECK_BITFIELD(mobility_flags, MOBILITY_STAND)) icon_state = "[icon_living]_rest" diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 608db74204..0faa047a94 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -545,7 +545,7 @@ emote("deathgasp") ADD_TRAIT(src, TRAIT_FAKEDEATH, source) ADD_TRAIT(src, TRAIT_DEATHCOMA, source) - tod = station_time_timestamp() + tod = gameTimestamp() update_stat() /mob/living/proc/unignore_slowdown(source) diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index d4437e17d5..dc6cccb9a9 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -29,8 +29,8 @@ last_enginesound_time = world.time playsound(src, engine_sound, 100, TRUE) -/obj/vehicle/sealed/car/MouseDrop_T(atom/dropping, mob/M) - if(!M.canmove || M.stat || M.restrained()) +/obj/vehicle/sealed/car/MouseDrop_T(atom/dropping, mob/living/M) + if(!istype(M) || !CHECK_MOBILITY(M, MOBILITY_USE)) return FALSE if(isliving(dropping) && M != dropping) var/mob/living/L = dropping diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 08e5a762a3..e7182f7a7a 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -652,7 +652,7 @@ if (HAS_TRAIT(C, TRAIT_NYMPHO) && lewd) if (C.getArousalLoss() > 80) C.mob_climax(forced_climax=TRUE) - C.SetStun(10)//We got your stun effects in somewhere, Kev. + C._REFACTORING_SetStun(10)//We got your stun effects in somewhere, Kev. else C.adjustArousalLoss(10) to_chat(C, "You feel a surge of arousal!")