Changes some 1s and 0s to TRUE and FALSE (#1967)

This commit is contained in:
CitadelStationBot
2017-07-10 18:13:16 -05:00
committed by kevinz000
parent 1b70c06474
commit ff6bbbedf5
522 changed files with 1924 additions and 1917 deletions
+2 -2
View File
@@ -2,8 +2,8 @@
/mob/camera
name = "camera mob"
density = 0
anchored = 1
density = FALSE
anchored = TRUE
status_flags = GODMODE // You can't damage it.
mouse_opacity = 0
see_in_dark = 7
@@ -8,11 +8,11 @@
invisibility = INVISIBILITY_ABSTRACT
density = 0
density = FALSE
stat = DEAD
canmove = 0
anchored = 1 // don't get pushed around
anchored = TRUE // don't get pushed around
var/mob/living/new_character //for instant transfer once the round is set up
/mob/dead/new_player/Initialize()
@@ -56,7 +56,7 @@
var/gender_specific //Something that can be worn by either gender, but looks different on each
var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none.
var/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears.
var/locked = 0 //Is this part locked from roundstart selection? Used for parts that apply effects
var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
var/dimension_x = 32
var/dimension_y = 32
var/center = FALSE //Should we center the sprite?
+2 -2
View File
@@ -10,9 +10,9 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
icon_state = "ghost"
layer = GHOST_LAYER
stat = DEAD
density = 0
density = FALSE
canmove = 0
anchored = 1 // don't get pushed around
anchored = TRUE // don't get pushed around
sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
see_invisible = SEE_INVISIBLE_OBSERVER
see_in_dark = 100
+2 -2
View File
@@ -3,8 +3,8 @@
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
var/canmove = 1
density = 0
anchored = 1
density = FALSE
anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -6,7 +6,7 @@
return 2 //no ears
/mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush)
..(AM, skipcatch = 1, hitpush = 0)
..(AM, skipcatch = TRUE, hitpush = FALSE)
/*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other.
@@ -69,11 +69,11 @@
if(A)
if(isliving(A))
var/mob/living/L = A
var/blocked = 0
var/blocked = FALSE
if(ishuman(A))
var/mob/living/carbon/human/H = A
if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
blocked = 1
blocked = TRUE
if(!blocked)
L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
L.Knockdown(100)
@@ -4,7 +4,7 @@
icon_state = "larva0"
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
density = 0
density = FALSE
maxHealth = 25
health = 25
@@ -52,7 +52,7 @@
if(affecting && affecting.dismemberable && affecting.get_damage() >= (affecting.max_damage - P.dismemberment))
affecting.dismember(P.damtype)
/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = 1, blocked = 0)
/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE)
if(!skipcatch) //ugly, but easy
if(in_throw_mode && !get_active_held_item()) //empty active hand and we're in throw mode
if(canmove && !restrained())
@@ -1,6 +1,6 @@
/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = 0)
/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE)
var/hit_percent = (100-blocked)/100
if(!damage || hit_percent <= 0)
return 0
@@ -1,5 +1,5 @@
/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0)
/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE)
// depending on the species, it will run the corresponding apply_damage code there
return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src)
@@ -109,7 +109,7 @@
return TRUE
return FALSE
/mob/living/carbon/human/hitby(atom/movable/AM, skipcatch = 0, hitpush = 1, blocked = 0)
/mob/living/carbon/human/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE)
var/spec_return = dna.species.spec_hitby(AM, src)
if(spec_return)
return spec_return
@@ -121,9 +121,9 @@
if(I.thrownby == src) //No throwing stuff at yourself to trigger hit reactions
return ..()
if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
hitpush = 0
skipcatch = 1
blocked = 1
hitpush = FALSE
skipcatch = TRUE
blocked = TRUE
else if(I)
if(I.throw_speed >= EMBED_THROWSPEED_THRESHOLD)
if(can_embed(I))
@@ -135,8 +135,8 @@
I.loc = src
L.receive_damage(I.w_class*I.embedded_impact_pain_multiplier)
visible_message("<span class='danger'>[I] embeds itself in [src]'s [L.name]!</span>","<span class='userdanger'>[I] embeds itself in your [L.name]!</span>")
hitpush = 0
skipcatch = 1 //can't catch the now embedded item
hitpush = FALSE
skipcatch = TRUE //can't catch the now embedded item
return ..()
@@ -457,12 +457,12 @@
/mob/living/carbon/human/emp_act(severity)
var/informed = 0
var/informed = FALSE
for(var/obj/item/bodypart/L in src.bodyparts)
if(L.status == BODYPART_ROBOTIC)
if(!informed)
to_chat(src, "<span class='userdanger'>You feel a sharp pain as your robotic limbs overload.</span>")
informed = 1
informed = TRUE
switch(severity)
if(1)
L.receive_damage(0,10)
@@ -554,7 +554,7 @@
var/obj/machinery/door/airlock/AL = D
if(!AL.CanAStarPass(RPID)) // only crack open doors we can't get through
inactivity_period = 20
AL.panel_open = 1
AL.panel_open = TRUE
AL.update_icon()
AL.shock(src,(100 - smartness)/2)
sleep(5)
@@ -570,7 +570,7 @@
sleep(5)
if(QDELETED(AL))
return
AL.panel_open = 0
AL.panel_open = FALSE
AL.update_icon()
D.open(2) //crowbar force
else
@@ -227,7 +227,7 @@
else
ui_interact(owner)
/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.conscious_state)
/datum/action/innate/swap_body/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.conscious_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -447,7 +447,7 @@
retaliate(Proj.firer)
..()
/mob/living/carbon/monkey/hitby(atom/movable/AM, skipcatch = 0, hitpush = 1, blocked = 0)
/mob/living/carbon/monkey/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE)
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.throwforce < src.health && I.thrownby && ishuman(I.thrownby))
+3 -3
View File
@@ -8,7 +8,7 @@
Returns
standard 0 if fail
*/
/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0)
/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE)
var/hit_percent = (100-blocked)/100
if(!damage || (hit_percent <= 0))
return 0
@@ -89,7 +89,7 @@
/mob/living/proc/apply_effect(effect = 0,effecttype = STUN, blocked = 0)
/mob/living/proc/apply_effect(effect = 0,effecttype = STUN, blocked = FALSE)
var/hit_percent = (100-blocked)/100
if(!effect || (hit_percent <= 0))
return 0
@@ -117,7 +117,7 @@
return 1
/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0)
/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0)
if(blocked >= 100)
return 0
if(stun)
@@ -0,0 +1,10 @@
diff a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm (rejected hunks)
@@ -58,7 +58,7 @@
return getStaminaLoss()
-/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = 0, stamina = 0)
+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0)
if(blocked >= 100)
return 0
if(brute)
+1 -1
View File
@@ -61,7 +61,7 @@
else
return 0
/mob/living/hitby(atom/movable/AM, skipcatch, hitpush = 1, blocked = 0)
/mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE)
if(istype(AM, /obj/item))
var/obj/item/I = AM
var/zone = ran_zone("chest", 65)//Hits a random part of the body, geared towards the chest
+2 -2
View File
@@ -16,8 +16,8 @@
name = "AI"
icon = 'icons/mob/ai.dmi'
icon_state = "ai"
anchored = 1
density = 1
anchored = TRUE
density = TRUE
canmove = 0
status_flags = CANSTUN|CANPUSH
a_intent = INTENT_HARM //so we always get pushed instead of trying to swap
+1 -1
View File
@@ -11,7 +11,7 @@
cameraFollow = null
anchored = 0 //unbolt floorbolts
anchored = FALSE //unbolt floorbolts
update_canmove()
if(eyeobj)
eyeobj.setLoc(get_turf(src))
@@ -12,7 +12,7 @@
var/list/cameras = list()
var/list/turfs = list()
var/list/seenby = list()
var/visible = 0
var/visible = FALSE
var/changed = 0
var/updating = 0
var/x = 0
@@ -1,5 +1,5 @@
/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0)
/mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE)
var/hit_percent = (100-blocked)/100
if(!damage || (hit_percent <= 0))
return 0
@@ -14,7 +14,7 @@
return 1
/mob/living/silicon/apply_effect(effect = 0,effecttype = STUN, blocked = 0)
/mob/living/silicon/apply_effect(effect = 0,effecttype = STUN, blocked = FALSE)
return 0 //The only effect that can hit them atm is flashes and they still directly edit so this works for now
/mob/living/silicon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) //immune to tox damage
+1 -1
View File
@@ -5,7 +5,7 @@
icon = 'icons/mob/pai.dmi'
icon_state = "repairbot"
mouse_opacity = 2
density = 0
density = FALSE
luminosity = 0
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_TINY
@@ -19,7 +19,7 @@
. = ..()
locked = 0 //unlock cover
locked = FALSE //unlock cover
update_canmove()
if(camera && camera.status)
@@ -45,12 +45,12 @@
var/obj/machinery/camera/camera = null
var/opened = 0
var/emagged = 0
var/emagged = FALSE
var/emag_cooldown = 0
var/wiresexposed = 0
var/ident = 0
var/locked = 1
var/locked = TRUE
var/list/req_access = list(GLOB.access_robotics)
var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list())
@@ -550,7 +550,7 @@
if(locked)
switch(alert("You cannot lock your cover again, are you sure?\n (You can still ask for a human to lock it)", "Unlock Own Cover", "Yes", "No"))
if("Yes")
locked = 0
locked = FALSE
update_icons()
to_chat(usr, "<span class='notice'>You unlock your cover.</span>")
@@ -983,7 +983,7 @@
camera.toggle_cam(src,0)
update_headlamp()
if(admin_revive)
locked = 1
locked = TRUE
notify_ai(NEW_BORG)
. = 1
@@ -92,7 +92,7 @@
if(!opened)//Cover is closed
if(locked)
to_chat(user, "<span class='notice'>You emag the cover lock.</span>")
locked = 0
locked = FALSE
if(shell) //A warning to Traitors who may not know that emagging AI shells does not slave them.
to_chat(user, "<span class='boldwarning'>[src] seems to be controlled remotely! Emagging the interface may not work as expected.</span>")
else
@@ -37,12 +37,12 @@
var/bot_name
var/list/player_access = list() //Additonal access the bots gets when player controlled
var/emagged = 0
var/emagged = FALSE
var/list/prev_access = list()
var/on = 1
var/open = 0//Maint panel
var/locked = 1
var/hacked = 0 //Used to differentiate between being hacked by silicons and emagged by humans.
var/on = TRUE
var/open = FALSE//Maint panel
var/locked = TRUE
var/hacked = FALSE //Used to differentiate between being hacked by silicons and emagged by humans.
var/text_hack = "" //Custom text returned to a silicon upon hacking a bot.
var/text_dehack = "" //Text shown when resetting a bots hacked status to normal.
var/text_dehack_fail = "" //Shown when a silicon tries to reset a bot emagged with the emag item, which cannot be reset.
@@ -103,14 +103,14 @@
/mob/living/simple_animal/bot/proc/turn_on()
if(stat)
return 0
on = 1
on = TRUE
set_light(initial(light_range))
update_icon()
diag_hud_set_botstat()
return 1
/mob/living/simple_animal/bot/proc/turn_off()
on = 0
on = FALSE
set_light(0)
bot_reset() //Resets an AI's call, should it exist.
update_icon()
@@ -168,14 +168,14 @@
/mob/living/simple_animal/bot/emag_act(mob/user)
if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
locked = 0
emagged = 1
locked = FALSE
emagged = TRUE
to_chat(user, "<span class='notice'>You bypass [src]'s controls.</span>")
return
if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging.
emagged = 2
remote_disabled = 1 //Manually emagging the bot locks out the AI built in panel.
locked = 1 //Access denied forever!
locked = TRUE //Access denied forever!
bot_reset()
turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP.
to_chat(src, "<span class='userdanger'>(#$*#$^^( OVERRIDE DETECTED</span>")
@@ -771,15 +771,15 @@ Pass a positive integer as an argument to override a bot's default speed.
if("hack")
if(emagged != 2)
emagged = 2
hacked = 1
locked = 1
hacked = TRUE
locked = TRUE
to_chat(usr, "<span class='warning'>[text_hack]</span>")
bot_reset()
else if(!hacked)
to_chat(usr, "<span class='boldannounce'>[text_dehack_fail]</span>")
else
emagged = 0
hacked = 0
emagged = FALSE
hacked = FALSE
to_chat(usr, "<span class='notice'>[text_dehack]</span>")
bot_reset()
if("ejectpai")
@@ -4,8 +4,8 @@
desc = "A little cleaning robot, he looks so excited!"
icon = 'icons/mob/aibots.dmi'
icon_state = "cleanbot0"
density = 0
anchored = 0
density = FALSE
anchored = FALSE
health = 25
maxHealth = 25
radio_key = /obj/item/device/encryptionkey/headset_service
@@ -197,7 +197,7 @@
/mob/living/simple_animal/bot/cleanbot/UnarmedAttack(atom/A)
if(istype(A, /obj/effect/decal/cleanable))
anchored = 1
anchored = TRUE
icon_state = "cleanbot-c"
visible_message("<span class='notice'>[src] begins to clean up [A].</span>")
mode = BOT_CLEANING
@@ -208,7 +208,7 @@
if(istype(AM, /obj/effect/decal/cleanable))
qdel(AM)
anchored = 0
anchored = FALSE
target = null
mode = BOT_IDLE
icon_state = "cleanbot[on]"
@@ -250,7 +250,7 @@
..()
/mob/living/simple_animal/bot/cleanbot/explode()
on = 0
on = FALSE
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
@@ -3,8 +3,8 @@
desc = "A security robot. He looks less than thrilled."
icon = 'icons/mob/aibots.dmi'
icon_state = "ed2090"
density = 1
anchored = 0
density = TRUE
anchored = FALSE
health = 100
maxHealth = 100
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
@@ -83,7 +83,7 @@
..()
target = null
oldtarget_name = null
anchored = 0
anchored = FALSE
walk_to(src,0)
last_found = world.time
set_weapon()
@@ -254,7 +254,7 @@ Auto Patrol[]"},
stun_attack(target)
mode = BOT_PREP_ARREST
anchored = 1
anchored = TRUE
target_lastloc = target.loc
return
@@ -288,7 +288,7 @@ Auto Patrol[]"},
if(BOT_ARREST)
if(!target)
anchored = 0
anchored = FALSE
mode = BOT_IDLE
last_found = world.time
frustration = 0
@@ -303,7 +303,7 @@ Auto Patrol[]"},
return
else
mode = BOT_PREP_ARREST
anchored = 0
anchored = FALSE
if(BOT_START_PATROL)
look_for_perp()
@@ -317,7 +317,7 @@ Auto Patrol[]"},
return
/mob/living/simple_animal/bot/ed209/proc/back_to_idle()
anchored = 0
anchored = FALSE
mode = BOT_IDLE
target = null
last_found = world.time
@@ -325,7 +325,7 @@ Auto Patrol[]"},
INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds
/mob/living/simple_animal/bot/ed209/proc/back_to_hunt()
anchored = 0
anchored = FALSE
frustration = 0
mode = BOT_HUNT
INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds
@@ -335,7 +335,7 @@ Auto Patrol[]"},
/mob/living/simple_animal/bot/ed209/proc/look_for_perp()
if(disabled)
return
anchored = 0
anchored = FALSE
threatlevel = 0
var/judgement_criteria = judgement_criteria()
for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
@@ -476,7 +476,7 @@ Auto Patrol[]"},
emagged = 2
set_weapon()
shootAt(toshoot)
emagged = 0
emagged = FALSE
set_weapon()
else
shootAt(toshoot)
@@ -4,8 +4,8 @@
desc = "A little floor repairing robot, he looks so excited!"
icon = 'icons/mob/aibots.dmi'
icon_state = "floorbot0"
density = 0
anchored = 0
density = FALSE
anchored = FALSE
health = 25
maxHealth = 25
@@ -61,7 +61,7 @@
target = null
oldloc = null
ignore_list = list()
anchored = 0
anchored = FALSE
update_icon()
/mob/living/simple_animal/bot/floorbot/set_custom_texts()
@@ -252,12 +252,12 @@
repair(target)
else if(emagged == 2 && isfloorturf(target))
var/turf/open/floor/F = target
anchored = 1
anchored = TRUE
mode = BOT_REPAIRING
F.ReplaceWithLattice()
audible_message("<span class='danger'>[src] makes an excited booping sound.</span>")
spawn(5)
anchored = 0
anchored = FALSE
mode = BOT_IDLE
target = null
path = list()
@@ -280,11 +280,11 @@
if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space.
result = scan_target
anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach.
anchored = TRUE //Prevent the floorbot being blown off-course while trying to reach a hull breach.
if(LINE_SPACE_MODE) //Space turfs in our chosen direction are considered.
if(get_dir(src, scan_target) == targetdirection)
result = scan_target
anchored = 1
anchored = TRUE
if(PLACE_TILE)
F = scan_target
if(istype(F, /turf/open/floor/plating)) //The floor must not already have a tile.
@@ -315,7 +315,7 @@
else if(!isfloorturf(target_turf))
return
if(isspaceturf(target_turf)) //If we are fixing an area not part of pure space, it is
anchored = 1
anchored = TRUE
icon_state = "floorbot-c"
visible_message("<span class='notice'>[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] </span>")
mode = BOT_REPAIRING
@@ -330,7 +330,7 @@
var/turf/open/floor/F = target_turf
if(F.type != initial(tiletype.turf_type) && (F.broken || F.burnt || istype(F, /turf/open/floor/plating)) || F.type == (initial(tiletype.turf_type) && (F.broken || F.burnt)))
anchored = 1
anchored = TRUE
icon_state = "floorbot-c"
mode = BOT_REPAIRING
visible_message("<span class='notice'>[src] begins repairing the floor.</span>")
@@ -341,7 +341,7 @@
F.ChangeTurf(/turf/open/floor/plasteel)
if(replacetiles && F.type != initial(tiletype.turf_type) && specialtiles && !istype(F, /turf/open/floor/plating))
anchored = 1
anchored = TRUE
icon_state = "floorbot-c"
mode = BOT_REPAIRING
visible_message("<span class='notice'>[src] begins replacing the floor tiles.</span>")
@@ -355,7 +355,7 @@
speak("Requesting refill of custom floortiles to continue replacing.")
mode = BOT_IDLE
update_icon()
anchored = 0
anchored = FALSE
target = null
/mob/living/simple_animal/bot/floorbot/update_icon()
@@ -363,7 +363,7 @@
/mob/living/simple_animal/bot/floorbot/explode()
on = 0
on = FALSE
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
@@ -8,8 +8,8 @@
desc = "A little medical robot. He looks somewhat underwhelmed."
icon = 'icons/mob/aibots.dmi'
icon_state = "medibot0"
density = 0
anchored = 0
density = FALSE
anchored = FALSE
health = 20
maxHealth = 20
pass_flags = PASSMOB
@@ -507,7 +507,7 @@
return 0
/mob/living/simple_animal/bot/medbot/explode()
on = 0
on = FALSE
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
@@ -12,8 +12,8 @@
name = "\improper MULEbot"
desc = "A Multiple Utility Load Effector bot."
icon_state = "mulebot0"
density = 1
anchored = 1
density = TRUE
anchored = TRUE
animate_movement=1
health = 50
maxHealth = 50
@@ -114,7 +114,7 @@
/mob/living/simple_animal/bot/mulebot/emag_act(mob/user)
if(emagged < 1)
emagged = 1
emagged = TRUE
if(!open)
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the [src]'s controls!</span>")
@@ -162,7 +162,7 @@
return
ui_interact(user)
/mob/living/simple_animal/bot/mulebot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
/mob/living/simple_animal/bot/mulebot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -428,7 +428,7 @@
/mob/living/simple_animal/bot/mulebot/handle_automated_action()
if(!has_power())
on = 0
on = FALSE
return
if(on)
var/speed = (wires.is_cut(WIRE_MOTOR1) ? 0 : 1) + (wires.is_cut(WIRE_MOTOR2) ? 0 : 2)
@@ -3,8 +3,8 @@
desc = "A little security robot. He looks less than thrilled."
icon = 'icons/mob/aibots.dmi'
icon_state = "secbot0"
density = 0
anchored = 0
density = FALSE
anchored = FALSE
health = 25
maxHealth = 25
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
@@ -86,7 +86,7 @@
..()
target = null
oldtarget_name = null
anchored = 0
anchored = FALSE
walk_to(src,0)
last_found = world.time
@@ -211,7 +211,7 @@ Auto Patrol: []"},
..()
/mob/living/simple_animal/bot/secbot/hitby(atom/movable/AM, skipcatch = 0, hitpush = 1, blocked = 0)
/mob/living/simple_animal/bot/secbot/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE)
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.throwforce < src.health && I.thrownby && ishuman(I.thrownby))
@@ -284,7 +284,7 @@ Auto Patrol: []"},
stun_attack(target)
mode = BOT_PREP_ARREST
anchored = 1
anchored = TRUE
target_lastloc = target.loc
return
@@ -318,7 +318,7 @@ Auto Patrol: []"},
if(BOT_ARREST)
if(!target)
anchored = 0
anchored = FALSE
mode = BOT_IDLE
last_found = world.time
frustration = 0
@@ -333,7 +333,7 @@ Auto Patrol: []"},
return
else //Try arresting again if the target escapes.
mode = BOT_PREP_ARREST
anchored = 0
anchored = FALSE
if(BOT_START_PATROL)
look_for_perp()
@@ -347,7 +347,7 @@ Auto Patrol: []"},
return
/mob/living/simple_animal/bot/secbot/proc/back_to_idle()
anchored = 0
anchored = FALSE
mode = BOT_IDLE
target = null
last_found = world.time
@@ -356,7 +356,7 @@ Auto Patrol: []"},
handle_automated_action() //ensure bot quickly responds
/mob/living/simple_animal/bot/secbot/proc/back_to_hunt()
anchored = 0
anchored = FALSE
frustration = 0
mode = BOT_HUNT
spawn(0)
@@ -364,7 +364,7 @@ Auto Patrol: []"},
// look for a criminal in view of the bot
/mob/living/simple_animal/bot/secbot/proc/look_for_perp()
anchored = 0
anchored = FALSE
var/judgement_criteria = judgement_criteria()
for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if((C.stat) || (C.handcuffed))
@@ -13,7 +13,7 @@
health = 2
harm_intent_damage = 1
friendly = "nudges"
density = 0
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
@@ -68,7 +68,7 @@
icon_state = "kitten"
icon_living = "kitten"
icon_dead = "kitten_dead"
density = 0
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -16,7 +16,7 @@
response_disarm = "shoos"
response_harm = "splats"
speak_emote = list("chitters")
density = 0
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
gold_core_spawnable = 2
verb_say = "chitters"
@@ -474,7 +474,7 @@
icon_state = "puppy"
icon_living = "puppy"
icon_dead = "puppy_dead"
density = 0
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -30,7 +30,7 @@
speed = 0
ventcrawler = VENTCRAWLER_ALWAYS
healable = 0
density = 0
density = FALSE
pass_flags = PASSTABLE | PASSMOB
sight = (SEE_TURFS | SEE_OBJS)
status_flags = (CANPUSH | CANSTUN | CANKNOCKDOWN)
@@ -66,7 +66,7 @@
var/obj/item/default_hatmask //If this exists, it will spawn in the hat/mask slot if it can fit
var/seeStatic = 1 //Whether we see static instead of mobs
var/visualAppearence = MAINTDRONE //What we appear as
var/hacked = 0 //If we have laws to destroy the station
var/hacked = FALSE //If we have laws to destroy the station
var/can_be_held = TRUE //if assholes can pick us up
var/flavortext = \
"\n<big><span class='warning'>DO NOT INTERFERE WITH THE ROUND AS A DRONE OR YOU WILL BE DRONE BANNED</span></big>\n"+\
@@ -136,7 +136,7 @@
"3. Your goals are to destroy, sabotage, hinder, break, and depower to the best of your abilities, You must never actively work against these goals."
to_chat(src, laws)
to_chat(src, "<i>Your onboard antivirus has initiated lockdown. Motor servos are impaired, ventilation access is denied, and your display reports that you are hacked to all nearby.</i>")
hacked = 1
hacked = TRUE
mind.special_role = "hacked drone"
seeStatic = 0 //I MUST SEE THEIR TERRIFIED FACES
ventcrawler = VENTCRAWLER_NONE //Again, balance
@@ -152,7 +152,7 @@
laws = initial(laws)
to_chat(src, laws)
to_chat(src, "<i>Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.</i>")
hacked = 0
hacked = FALSE
mind.special_role = null
seeStatic = initial(seeStatic)
ventcrawler = initial(ventcrawler)
@@ -179,7 +179,7 @@
speak_emote = list("cheeps")
emote_hear = list("cheeps.")
emote_see = list("pecks at the ground.","flaps its tiny wings.")
density = 0
density = FALSE
speak_chance = 2
turns_per_move = 2
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 1)
@@ -226,7 +226,7 @@
speak_emote = list("clucks","croons")
emote_hear = list("clucks.")
emote_see = list("pecks at the ground.","flaps its wings viciously.")
density = 0
density = FALSE
speak_chance = 2
turns_per_move = 3
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2)
@@ -15,7 +15,7 @@
response_disarm = "shoos"
response_harm = "stomps on"
ventcrawler = VENTCRAWLER_ALWAYS
density = 0
density = FALSE
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
gold_core_spawnable = 2
@@ -17,7 +17,7 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "splats"
density = 0
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
@@ -54,13 +54,13 @@
else if(A)
if(isliving(A) && A != summoner)
var/mob/living/L = A
var/blocked = 0
var/blocked = FALSE
if(hasmatchingsummoner(A)) //if the summoner matches don't hurt them
blocked = 1
blocked = TRUE
if(ishuman(A))
var/mob/living/carbon/human/H = A
if(H.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
blocked = 1
blocked = TRUE
if(!blocked)
L.drop_all_held_items()
L.visible_message("<span class='danger'>[src] slams into [L]!</span>", "<span class='userdanger'>[src] slams into you!</span>")
@@ -146,7 +146,7 @@
if(busy == MOVING_TO_TARGET)
if(cocoon_target == C && get_dist(src,cocoon_target) > 1)
cocoon_target = null
busy = 0
busy = FALSE
stop_automated_movement = 0
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/handle_automated_action()
@@ -71,7 +71,7 @@
damage = 0
icon_state = "tentacle_end"
/obj/item/projectile/mega_arachnid/on_hit(atom/target, blocked = 0)
/obj/item/projectile/mega_arachnid/on_hit(atom/target, blocked = FALSE)
if(iscarbon(target) && blocked < 100)
var/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid/B = new /obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid(get_turf(target))
B.Crossed(target)
@@ -133,7 +133,7 @@
nondirectional_sprite = TRUE
impact_effect_type = /obj/effect/temp_visual/leaper_projectile_impact
/obj/item/projectile/leaper/on_hit(atom/target, blocked = 0)
/obj/item/projectile/leaper/on_hit(atom/target, blocked = FALSE)
..()
if(iscarbon(target))
var/mob/living/carbon/C = target
@@ -393,7 +393,7 @@ Difficulty: Hard
icon_aggro = "bloodbrood"
attacktext = "pierces"
color = "#C80000"
density = 0
density = FALSE
faction = list("mining", "boss")
weather_immunities = list("lava","ash")
@@ -251,7 +251,7 @@ Difficulty: Very Hard
damage_type = BRUTE
pass_flags = PASSTABLE
/obj/item/projectile/colossus/on_hit(atom/target, blocked = 0)
/obj/item/projectile/colossus/on_hit(atom/target, blocked = FALSE)
. = ..()
if(isturf(target) || isobj(target))
target.ex_act(2)
@@ -381,7 +381,7 @@ Difficulty: Very Hard
light_range = 8
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
use_power = NO_POWER_USE
density = 1
density = TRUE
flags = HEAR
var/activation_method
var/list/possible_methods = list(ACTIVATE_TOUCH, ACTIVATE_SPEECH, ACTIVATE_HEAT, ACTIVATE_BULLET, ACTIVATE_ENERGY, ACTIVATE_BOMB, ACTIVATE_MOB_BUMP, ACTIVATE_WEAPON, ACTIVATE_MAGIC)
@@ -633,7 +633,7 @@ Difficulty: Very Hard
health = 2
harm_intent_damage = 1
friendly = "mends"
density = 0
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
@@ -728,8 +728,8 @@ Difficulty: Very Hard
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
@@ -36,7 +36,7 @@
speak_emote = list("clatters")
stop_automated_movement = 1
wander = 0
var/attempt_open = 0
var/attempt_open = FALSE
// Pickup loot
/mob/living/simple_animal/hostile/mimic/crate/Initialize(mapload)
@@ -75,7 +75,7 @@
/mob/living/simple_animal/hostile/mimic/crate/proc/trigger()
if(!attempt_open)
visible_message("<b>[src]</b> starts to move!")
attempt_open = 1
attempt_open = TRUE
/mob/living/simple_animal/hostile/mimic/crate/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
trigger()
@@ -49,7 +49,7 @@
. = 1
/mob/living/simple_animal/hostile/asteroid/goliath/death(gibbed)
anchored = 0
anchored = FALSE
..(gibbed)
/mob/living/simple_animal/hostile/asteroid/goliath/OpenFire()
@@ -11,7 +11,7 @@
emote_see = list("sniffs.", "burps.")
weather_immunities = list("lava","ash")
faction = list("mining", "ashwalker")
density = 0
density = FALSE
speak_chance = 1
turns_per_move = 8
obj_damage = 0
@@ -16,7 +16,7 @@
response_help = "pets"
response_disarm = "pokes"
response_harm = "splats"
density = 0
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
attack_sound = 'sound/effects/reee.ogg'
@@ -43,7 +43,7 @@
search_objects = 1 // So that it can see through walls
sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
anchored = 1
anchored = TRUE
gold_core_spawnable = 1
@@ -33,7 +33,7 @@
icon_state = "parrot_fly"
icon_living = "parrot_fly"
icon_dead = "parrot_dead"
density = 0
density = FALSE
health = 80
maxHealth = 80
pass_flags = PASSTABLE | PASSMOB
@@ -302,7 +302,7 @@
else
health = 0
icon_state = icon_dead
density = 0
density = FALSE
lying = 1
..()
@@ -11,7 +11,7 @@
var/mob_type = /mob/living/simple_animal/hostile/carp
var/spawn_text = "emerges from"
status_flags = 0
anchored = 1
anchored = TRUE
AIStatus = AI_OFF
a_intent = INTENT_HARM
stop_automated_movement = 1
+1 -1
View File
@@ -753,7 +753,7 @@
var/turf/T = get_turf(src)
if(M.loc != T)
var/old_density = density
density = 0
density = FALSE
var/can_step = step_towards(M, T)
density = old_density
if(!can_step)
+1 -1
View File
@@ -1,5 +1,5 @@
/mob
density = 1
density = TRUE
layer = MOB_LAYER
animate_movement = 2
flags = HEAR