This commit is contained in:
KalevTait
2022-07-09 12:24:55 +01:00
committed by GitHub
parent 1bef55b078
commit 99c1adbcf2
12 changed files with 35 additions and 35 deletions
+1 -1
View File
@@ -157,7 +157,7 @@
if(in_range(src, user))
if(input == code)
to_chat(user, "<span class='notice'>The crate unlocks!</span>")
locked = 0
locked = FALSE
overlays.Cut()
overlays += "securecrateg"
else if(input == null || length(input) != codelen)
@@ -26,17 +26,17 @@
if(M.stat == DEAD)
M.faction = list("neutral")
M.revive()
M.can_collar = 1
M.can_collar = TRUE
if(istype(target, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
if(malfunctioning)
H.faction |= list("lazarus", "\ref[user]")
H.robust_searching = 1
H.robust_searching = TRUE
H.friends += user
H.attack_same = 1
H.attack_same = TRUE
log_game("[user] has revived hostile mob [target] with a malfunctioning lazarus injector")
else
H.attack_same = 0
H.attack_same = FALSE
loaded = 0
user.visible_message("<span class='notice'>[user] injects [M] with [src], reviving it.</span>")
playsound(src,'sound/effects/refill.ogg',50,1)
@@ -14,7 +14,7 @@
attack_verb = list("hit", "pierced", "sliced", "attacked")
var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
var/drill_verb = "picking"
sharp = 1
sharp = TRUE
var/excavation_amount = 100
usesound = 'sound/effects/picaxe1.ogg'
toolspeed = 1
@@ -180,8 +180,8 @@
name = "pod computer"
icon_state = "pod_computer"
icon = 'icons/obj/lavaland/pod_computer.dmi'
anchored = 1
density = 1
anchored = TRUE
density = TRUE
pixel_y = -32
/obj/item/gps/computer/attackby(obj/item/W, mob/user, params)
@@ -252,8 +252,8 @@
icon_state = "fans"
name = "environmental regulation system"
desc = "A large machine releasing a constant gust of air."
anchored = 1
density = 1
anchored = TRUE
density = TRUE
var/arbitraryatmosblockingvar = 1
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 5
@@ -289,7 +289,7 @@
name = "tiny fan"
desc = "A tiny fan, releasing a thin gust of air."
layer = TURF_LAYER+0.1
density = 0
density = FALSE
icon_state = "fan_tiny"
buildstackamount = 2
@@ -315,9 +315,9 @@
icon_state = "tubes"
icon = 'icons/obj/lavaland/survival_pod.dmi'
name = "tubes"
anchored = 1
anchored = TRUE
layer = MOB_LAYER - 0.2
density = 0
density = FALSE
/obj/structure/tubes/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/wrench))
@@ -31,7 +31,7 @@
icon_state = "spectral"
item_state = "spectral"
flags = CONDUCT
sharp = 1
sharp = TRUE
w_class = WEIGHT_CLASS_BULKY
force = 1
throwforce = 1
@@ -24,7 +24,7 @@
icon_state = "anomaly_crystal"
light_range = 8
use_power = NO_POWER_USE
density = 1
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/activation_method = "touch"
var/activation_damage_type = null
@@ -252,7 +252,7 @@
health = 2
harm_intent_damage = 1
friendly = "mends"
density = 0
density = FALSE
flying = TRUE
obj_damage = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
@@ -263,15 +263,15 @@
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
luminosity = 4
faction = list("neutral")
universal_understand = 1
del_on_death = 1
universal_understand = TRUE
del_on_death = TRUE
unsuitable_atmos_damage = 0
flying = 1
flying = TRUE
minbodytemp = 0
maxbodytemp = 1500
environment_smash = 0
AIStatus = AI_OFF
stop_automated_movement = 1
stop_automated_movement = TRUE
var/heal_power = 5
/mob/living/simple_animal/hostile/lightgeist/New()
@@ -341,8 +341,8 @@
name = "quantum entanglement stasis warp field"
desc = "You can hardly comprehend this thing... which is why you can't see it."
icon_state = null //This shouldn't even be visible, so if it DOES show up, at least nobody will notice
density = 1
anchored = 1
density = TRUE
anchored = TRUE
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
var/mob/living/simple_animal/holder_animal
@@ -362,7 +362,7 @@
/obj/structure/closet/stasis/Entered(atom/A)
if(isliving(A) && holder_animal)
var/mob/living/L = A
L.notransform = 1
L.notransform = TRUE
ADD_TRAIT(L, TRAIT_MUTE, STASIS_MUTE)
L.status_flags |= GODMODE
L.mind.transfer_to(holder_animal)
@@ -375,7 +375,7 @@
for(var/mob/living/L in src)
REMOVE_TRAIT(L, TRAIT_MUTE, STASIS_MUTE)
L.status_flags &= ~GODMODE
L.notransform = 0
L.notransform = FALSE
if(holder_animal && !QDELETED(holder_animal))
holder_animal.mind.transfer_to(L)
L.mind.RemoveSpell(/obj/effect/proc_holder/spell/exit_possession)
@@ -393,7 +393,7 @@
name = "Exit Possession"
desc = "Exits the body you are possessing"
charge_max = 60
clothes_req = 0
clothes_req = FALSE
invocation_type = "none"
action_icon_state = "exit_possession"
sound = null
@@ -433,11 +433,11 @@
Z.desc = "It's shaped an awful lot like [user.name]."
Z.setDir(user.dir)
user.forceMove(Z)
user.notransform = 1
user.notransform = TRUE
user.status_flags |= GODMODE
spawn(100)
user.status_flags &= ~GODMODE
user.notransform = 0
user.notransform = FALSE
user.forceMove(get_turf(Z))
user.visible_message("<span class='danger'>[user] pops back into reality!</span>")
Z.can_destroy = TRUE
+2 -2
View File
@@ -5,8 +5,8 @@
name = "unloading machine"
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "unloader"
density = 1
anchored = 1.0
density = TRUE
anchored = TRUE
input_dir = WEST
output_dir = EAST
speed_process = 1
+1 -1
View File
@@ -83,6 +83,6 @@
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "mining car (not for rails)"
icon_state = "miningcar"
density = 1
density = TRUE
icon_opened = "miningcar_open"
icon_closed = "miningcar"
+3 -3
View File
@@ -32,11 +32,11 @@
/obj/item/stack/ore/plasma, /obj/item/stack/ore/uranium, /obj/item/stack/ore/iron,
/obj/item/stack/ore/bananium, /obj/item/stack/ore/tranquillite, /obj/item/stack/ore/glass,
/obj/item/stack/ore/titanium)
healable = 0
healable = FALSE
loot = list(/obj/effect/decal/cleanable/robot_debris)
del_on_death = TRUE
var/mode = MINEDRONE_COLLECT
var/light_on = 0
var/light_on = FALSE
var/mesons_active
var/obj/item/gun/energy/kinetic_accelerator/minebot/stored_gun
@@ -70,7 +70,7 @@
/mob/living/simple_animal/hostile/mining_drone/sentience_act()
..()
check_friendly_fire = 0
check_friendly_fire = FALSE
/mob/living/simple_animal/hostile/mining_drone/examine(mob/user)
. = ..()
+1 -1
View File
@@ -62,7 +62,7 @@
return
usr.set_machine(src)
add_fingerprint(usr)
if(processing == 1)
if(processing)
to_chat(usr, "<span class='notice'>The machine is processing.</span>")
return
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+1 -1
View File
@@ -220,7 +220,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
item_state = "Gibtonite ore"
w_class = WEIGHT_CLASS_BULKY
throw_range = 0
anchored = 1 //Forces people to carry it by hand, no pulling!
anchored = TRUE //Forces people to carry it by hand, no pulling!
var/primed = 0
var/det_time = 100
var/quality = GIBTONITE_QUALITY_LOW //How pure this gibtonite is, determines the explosion produced by it and is derived from the det_time of the rock wall it was taken from, higher value = better