mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-09 16:14:13 +00:00
Fixes a ton of sentence starts with non capitalised improper nouns. (#37099)
* Fixes capitalisation on throwing stuff in disposals * in fact, fixes it for everything * even more * outta here
This commit is contained in:
@@ -669,7 +669,7 @@ var/bloodstone_backup = 0
|
|||||||
playsound(T, 'sound/weapons/hivehand_empty.ogg', 75, 1)
|
playsound(T, 'sound/weapons/hivehand_empty.ogg', 75, 1)
|
||||||
. = ..()
|
. = ..()
|
||||||
if (.)
|
if (.)
|
||||||
visible_message("<span class='warning'>\the [src] nails \the [A] to \the [T].</span>")
|
visible_message("<span class='warning'>\The [src] nails \the [A] to \the [T].</span>")
|
||||||
|
|
||||||
///////////////////////////////////CULT DANCE////////////////////////////////////
|
///////////////////////////////////CULT DANCE////////////////////////////////////
|
||||||
//used by the cultdance emote. other cult dances have their own procs
|
//used by the cultdance emote. other cult dances have their own procs
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
|
|||||||
set name = "Pick up telephone"
|
set name = "Pick up telephone"
|
||||||
set src in oview(1)
|
set src in oview(1)
|
||||||
if(!landline)
|
if(!landline)
|
||||||
to_chat(usr, "<span class='notice'>\the [src] model does not come with a telephone!</span>")
|
to_chat(usr, "<span class='notice'>\The [src] model does not come with a telephone!</span>")
|
||||||
return
|
return
|
||||||
landline.pick_up_phone(usr)
|
landline.pick_up_phone(usr)
|
||||||
|
|
||||||
|
|||||||
@@ -233,7 +233,7 @@
|
|||||||
else
|
else
|
||||||
calculated_weight += 5
|
calculated_weight += 5
|
||||||
playsound(get_turf(src), 'sound/machines/chime.ogg', 50, 1)
|
playsound(get_turf(src), 'sound/machines/chime.ogg', 50, 1)
|
||||||
visible_message("<span class='notice'>\the [src] prints out the weighed [current_manifest]</span>")
|
visible_message("<span class='notice'>\The [src] prints out the weighed [current_manifest]</span>")
|
||||||
current_manifest.info += "<br>Total object weight: [calculated_weight]kg<br>CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>"
|
current_manifest.info += "<br>Total object weight: [calculated_weight]kg<br>CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS<hr>"
|
||||||
current_manifest.forceMove(get_turf(src))
|
current_manifest.forceMove(get_turf(src))
|
||||||
current_manifest = null
|
current_manifest = null
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
|
|
||||||
/obj/machinery/dna_scannernew/crowbarDestroy(mob/user, obj/item/tool/crowbar/I)
|
/obj/machinery/dna_scannernew/crowbarDestroy(mob/user, obj/item/tool/crowbar/I)
|
||||||
if(occupant)
|
if(occupant)
|
||||||
to_chat(user, "<span class='warning'>\the [src] is occupied.</span>")
|
to_chat(user, "<span class='warning'>\The [src] is occupied.</span>")
|
||||||
return FALSE
|
return FALSE
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
@@ -287,7 +287,7 @@
|
|||||||
else
|
else
|
||||||
visible_message("[user] places [M] into \the [src].")
|
visible_message("[user] places [M] into \the [src].")
|
||||||
else
|
else
|
||||||
visible_message("\the [M] is placed into \the [src].")
|
visible_message("\The [M] is placed into \the [src].")
|
||||||
|
|
||||||
// search for ghosts, if the corpse is empty and the scanner is connected to a cloner
|
// search for ghosts, if the corpse is empty and the scanner is connected to a cloner
|
||||||
for(dir in cardinal)
|
for(dir in cardinal)
|
||||||
|
|||||||
@@ -372,7 +372,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list (
|
|||||||
src.health -= W.force * 0.75
|
src.health -= W.force * 0.75
|
||||||
else
|
else
|
||||||
if (src.health <= 0)
|
if (src.health <= 0)
|
||||||
visible_message("<span class='danger'>\the [src] is smashed apart!</span>")
|
visible_message("<span class='danger'>\The [src] is smashed apart!</span>")
|
||||||
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
||||||
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
||||||
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
||||||
@@ -383,13 +383,13 @@ var/global/list/datum/stack_recipe/snow_recipes = list (
|
|||||||
/obj/structure/window/barricade/snow/ex_act(severity)
|
/obj/structure/window/barricade/snow/ex_act(severity)
|
||||||
switch(severity)
|
switch(severity)
|
||||||
if(1.0)
|
if(1.0)
|
||||||
visible_message("<span class='danger'>\the [src] is blown apart!</span>")
|
visible_message("<span class='danger'>\The [src] is blown apart!</span>")
|
||||||
qdel(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
if(2.0)
|
if(2.0)
|
||||||
src.health -= 25
|
src.health -= 25
|
||||||
if (src.health <= 0)
|
if (src.health <= 0)
|
||||||
visible_message("<span class='danger'>\the [src] is blown apart!</span>")
|
visible_message("<span class='danger'>\The [src] is blown apart!</span>")
|
||||||
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
||||||
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
||||||
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
new /obj/item/stack/sheet/snow(get_turf(src), 1)
|
||||||
|
|||||||
@@ -145,7 +145,7 @@
|
|||||||
|
|
||||||
/mob/living/simple_animal/hostile/retaliate/snowman/death(gibbed)
|
/mob/living/simple_animal/hostile/retaliate/snowman/death(gibbed)
|
||||||
visible_message("<span class='game say'><span class='name'>[name]</span> murmurs, \"[pick("Oh my snowballs...","I will...be back...")]\"</span>")
|
visible_message("<span class='game say'><span class='name'>[name]</span> murmurs, \"[pick("Oh my snowballs...","I will...be back...")]\"</span>")
|
||||||
visible_message("\the [src] collapses in a pile of snow.")
|
visible_message("\The [src] collapses in a pile of snow.")
|
||||||
var/turf/T = get_turf(src)
|
var/turf/T = get_turf(src)
|
||||||
new /obj/item/stack/sheet/snow(T, 1)
|
new /obj/item/stack/sheet/snow(T, 1)
|
||||||
new /obj/item/stack/sheet/snow(T, 1)
|
new /obj/item/stack/sheet/snow(T, 1)
|
||||||
|
|||||||
@@ -241,7 +241,7 @@
|
|||||||
else
|
else
|
||||||
visible_message("[user] places \the [L] into \the [src].")
|
visible_message("[user] places \the [L] into \the [src].")
|
||||||
else
|
else
|
||||||
visible_message("\the [L] is placed into \the [src].")
|
visible_message("\The [L] is placed into \the [src].")
|
||||||
|
|
||||||
sedativeblock = TRUE
|
sedativeblock = TRUE
|
||||||
sleep(drag_delay)
|
sleep(drag_delay)
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ var/list/apiaries_list = list()
|
|||||||
return
|
return
|
||||||
|
|
||||||
if(alert(user,"Harvest the honeycombs?[((queen_bees_inside || worker_bees_inside) && species.angery) ? " Be ready to handle some angry bees!" : ""]","[name]","Yes","No")== "Yes")
|
if(alert(user,"Harvest the honeycombs?[((queen_bees_inside || worker_bees_inside) && species.angery) ? " Be ready to handle some angry bees!" : ""]","[name]","Yes","No")== "Yes")
|
||||||
user.visible_message("<span class='notice'>\the [user] begins dismantling the apiary.</span>","<span class='danger'>You begin harvesting the honeycombs.</span>")
|
user.visible_message("<span class='notice'>\The [user] begins dismantling the apiary.</span>","<span class='danger'>You begin harvesting the honeycombs.</span>")
|
||||||
|
|
||||||
if((queen_bees_inside || worker_bees_inside) && species.angery)
|
if((queen_bees_inside || worker_bees_inside) && species.angery)
|
||||||
user.visible_message("<span class='danger'>The [species.common_name] don't like that.</span>")
|
user.visible_message("<span class='danger'>The [species.common_name] don't like that.</span>")
|
||||||
@@ -213,7 +213,7 @@ var/list/apiaries_list = list()
|
|||||||
user.put_in_hands(TrashItem)
|
user.put_in_hands(TrashItem)
|
||||||
qdel(O)
|
qdel(O)
|
||||||
else if(istype(O, /obj/item/weapon/hatchet) || iscrowbar(O))
|
else if(istype(O, /obj/item/weapon/hatchet) || iscrowbar(O))
|
||||||
user.visible_message("<span class='notice'>\the [user] begins dismantling the apiary.</span>","<span class='danger'>You begin to dismantle the apiary.</span>")
|
user.visible_message("<span class='notice'>\The [user] begins dismantling the apiary.</span>","<span class='danger'>You begin to dismantle the apiary.</span>")
|
||||||
|
|
||||||
if((queen_bees_inside || worker_bees_inside) && species.angery)
|
if((queen_bees_inside || worker_bees_inside) && species.angery)
|
||||||
user.visible_message("<span class='danger'>The [species.common_name] don't like that.</span>")
|
user.visible_message("<span class='danger'>The [species.common_name] don't like that.</span>")
|
||||||
@@ -261,7 +261,7 @@ var/list/apiaries_list = list()
|
|||||||
else
|
else
|
||||||
to_chat(user, "<span class='notice'>There are no more bees in the net.</span>")
|
to_chat(user, "<span class='notice'>There are no more bees in the net.</span>")
|
||||||
else
|
else
|
||||||
user.visible_message("<span class='warning'>\the [user] hits \the [src] with \the [O]!</span>","<span class='warning'>You hit \the [src] with \the [O]!</span>")
|
user.visible_message("<span class='warning'>\The [user] hits \the [src] with \the [O]!</span>","<span class='warning'>You hit \the [src] with \the [O]!</span>")
|
||||||
angry_swarm(user)
|
angry_swarm(user)
|
||||||
|
|
||||||
//Called every time a bee enters the hive.
|
//Called every time a bee enters the hive.
|
||||||
|
|||||||
@@ -424,7 +424,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
|
|||||||
else if(W.type == /obj/item/weapon/kitchen/utensil/knife/large && !armed && user.a_intent != I_HURT)
|
else if(W.type == /obj/item/weapon/kitchen/utensil/knife/large && !armed && user.a_intent != I_HURT)
|
||||||
if(user.drop_item(W))
|
if(user.drop_item(W))
|
||||||
qdel(W)
|
qdel(W)
|
||||||
to_chat(user, "<span class='notice'>\the [src] extends a tiny arm from a hidden compartment and grasps \the [W]. Its light blinks excitedly for a moment before returning to normal.</span>")
|
to_chat(user, "<span class='notice'>\The [src] extends a tiny arm from a hidden compartment and grasps \the [W]. Its light blinks excitedly for a moment before returning to normal.</span>")
|
||||||
armed++
|
armed++
|
||||||
icon_state = "maidbot_battle[on]"
|
icon_state = "maidbot_battle[on]"
|
||||||
icon_initial = "maidbot_battle"
|
icon_initial = "maidbot_battle"
|
||||||
|
|||||||
@@ -649,7 +649,7 @@ var/global/list/cryo_health_indicator = list( "full" = image("icon" = 'icons/obj
|
|||||||
else
|
else
|
||||||
visible_message("[user] places [M] into \the [src].")
|
visible_message("[user] places [M] into \the [src].")
|
||||||
else
|
else
|
||||||
visible_message("\the [M] is placed into \the [src].")
|
visible_message("\The [M] is placed into \the [src].")
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
/obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject()
|
/obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject()
|
||||||
|
|||||||
@@ -84,9 +84,9 @@
|
|||||||
use_power(500)
|
use_power(500)
|
||||||
src.grinded[ourtype]++
|
src.grinded[ourtype]++
|
||||||
if(user)
|
if(user)
|
||||||
to_chat(user, "<span class='notice'>\the [src] now has [grinded[ourtype]] animals worth of material of this type stored.</span>")
|
to_chat(user, "<span class='notice'>\The [src] now has [grinded[ourtype]] animals worth of material of this type stored.</span>")
|
||||||
else
|
else
|
||||||
visible_message("<span class='notice'>\the [src] now has [grinded[ourtype]] animals worth of material of this type stored.</span>")
|
visible_message("<span class='notice'>\The [src] now has [grinded[ourtype]] animals worth of material of this type stored.</span>")
|
||||||
return TRUE
|
return TRUE
|
||||||
else
|
else
|
||||||
failmsg = "\the [src] only accepts animals!"
|
failmsg = "\the [src] only accepts animals!"
|
||||||
|
|||||||
@@ -81,10 +81,10 @@
|
|||||||
to_chat(user, "<span class='warning'>There's no phone to fix!</span>")
|
to_chat(user, "<span class='warning'>There's no phone to fix!</span>")
|
||||||
return
|
return
|
||||||
if(phone.linked_landline)
|
if(phone.linked_landline)
|
||||||
to_chat(user, "<span class='warning'>\the [phone] is already connected!</span>")
|
to_chat(user, "<span class='warning'>\The [phone] is already connected!</span>")
|
||||||
return
|
return
|
||||||
if(linked_phone)
|
if(linked_phone)
|
||||||
to_chat(user, "<span class='warning'>\the [phone] is connected elsewhere!</span>")
|
to_chat(user, "<span class='warning'>\The [phone] is connected elsewhere!</span>")
|
||||||
return
|
return
|
||||||
phone.linked_landline = src
|
phone.linked_landline = src
|
||||||
linked_phone = phone
|
linked_phone = phone
|
||||||
@@ -170,7 +170,7 @@
|
|||||||
to_chat(user, "<span class='notice'>You cannot do this while incapacitated.</span>")
|
to_chat(user, "<span class='notice'>You cannot do this while incapacitated.</span>")
|
||||||
return
|
return
|
||||||
if(!phone)
|
if(!phone)
|
||||||
to_chat(user, "<span class='notice'>\the [src] has no telephone!</span>")
|
to_chat(user, "<span class='notice'>\The [src] has no telephone!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
user.put_in_hands(src.phone)
|
user.put_in_hands(src.phone)
|
||||||
@@ -328,7 +328,7 @@
|
|||||||
linked_landline.linked_phone = null
|
linked_landline.linked_phone = null
|
||||||
linked_landline = null
|
linked_landline = null
|
||||||
broken = TRUE
|
broken = TRUE
|
||||||
visible_message("<span class='warning'>\the [src] releases its magic smoke!</span>")
|
visible_message("<span class='warning'>\The [src] releases its magic smoke!</span>")
|
||||||
spawn(1)
|
spawn(1)
|
||||||
flashbangprime()
|
flashbangprime()
|
||||||
|
|
||||||
@@ -385,7 +385,7 @@
|
|||||||
linked_landline.listening_operators -= src
|
linked_landline.listening_operators -= src
|
||||||
linked_landline = null
|
linked_landline = null
|
||||||
broken = TRUE
|
broken = TRUE
|
||||||
visible_message("<span class='warning'>\the [src] releases its magic smoke!</span>")
|
visible_message("<span class='warning'>\The [src] releases its magic smoke!</span>")
|
||||||
spawn(1)
|
spawn(1)
|
||||||
flashbangprime()
|
flashbangprime()
|
||||||
|
|
||||||
|
|||||||
@@ -619,7 +619,7 @@ var/list/requests_consoles_categorised = list("Command" = list(),"Engineering" =
|
|||||||
set name = "Pick up telephone"
|
set name = "Pick up telephone"
|
||||||
set src in view(1)
|
set src in view(1)
|
||||||
if(!landline)
|
if(!landline)
|
||||||
to_chat(usr, "<span class='notice'>\the [src] model does not come with a telephone!</span>")
|
to_chat(usr, "<span class='notice'>\The [src] model does not come with a telephone!</span>")
|
||||||
return
|
return
|
||||||
landline.pick_up_phone(usr)
|
landline.pick_up_phone(usr)
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ var/list/pda_multicasters = list()
|
|||||||
|
|
||||||
/obj/machinery/pda_multicaster/proc/toggle_power(mob/user)
|
/obj/machinery/pda_multicaster/proc/toggle_power(mob/user)
|
||||||
on = !on
|
on = !on
|
||||||
visible_message("\the [user] turns \the [src] [on ? "on" : "off"].")
|
visible_message("\The [user] turns \the [src] [on ? "on" : "off"].")
|
||||||
update_icon()
|
update_icon()
|
||||||
|
|
||||||
/obj/machinery/pda_multicaster/proc/check_status()
|
/obj/machinery/pda_multicaster/proc/check_status()
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
usr.set_machine(src)
|
usr.set_machine(src)
|
||||||
|
|
||||||
if(charges <= 0)
|
if(charges <= 0)
|
||||||
to_chat(user, "<span class='notice'>\the [src] lies silent.</span>")
|
to_chat(user, "<span class='notice'>\The [src] lies silent.</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
else if(!istype(user, /mob/living/carbon/human))
|
else if(!istype(user, /mob/living/carbon/human))
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
user.whisper(pick(wish_whispers))
|
user.whisper(pick(wish_whispers))
|
||||||
spawn(10) //OH SHI-
|
spawn(10) //OH SHI-
|
||||||
message_admins("[user] has interacted with \the [src] (Wish Granter) and is now its powerful avatar!")
|
message_admins("[user] has interacted with \the [src] (Wish Granter) and is now its powerful avatar!")
|
||||||
user.visible_message("<span class='sinister'>[user] clenches in pain before \the [src] and then raises back up with a demonic and soulless expression!</span>", "<span class='sinister'>\the [src] answers and your head pounds for a moment before your vision clears. You are the avatar of [src], and your power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you! No one must know, first!</span>", "<span class='sinister'>You hear a demonic hum, this can't be good!</span>")
|
user.visible_message("<span class='sinister'>[user] clenches in pain before \the [src] and then raises back up with a demonic and soulless expression!</span>", "<span class='sinister'>\The [src] answers and your head pounds for a moment before your vision clears. You are the avatar of [src], and your power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you! No one must know, first!</span>", "<span class='sinister'>You hear a demonic hum, this can't be good!</span>")
|
||||||
charges--
|
charges--
|
||||||
insisting = 0
|
insisting = 0
|
||||||
|
|
||||||
|
|||||||
@@ -577,7 +577,7 @@
|
|||||||
else
|
else
|
||||||
chassis.use_power(energy_drain)
|
chassis.use_power(energy_drain)
|
||||||
else
|
else
|
||||||
occupant_message("<span class='warning'>\the [src]'s error light flickers[istext(t) ? ": [t]" : "."]</span>")
|
occupant_message("<span class='warning'>\The [src]'s error light flickers[istext(t) ? ": [t]" : "."]</span>")
|
||||||
|
|
||||||
R.busy = FALSE
|
R.busy = FALSE
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
to_chat(user, "<span class='warning'>Printing energy spent, please wait a moment.</span>")
|
to_chat(user, "<span class='warning'>Printing energy spent, please wait a moment.</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
visible_message("<span class='warning'>\the [src] rattles and prints out a sheet of paper.</span>", 1)
|
visible_message("<span class='warning'>\The [src] rattles and prints out a sheet of paper.</span>", 1)
|
||||||
last_print = world.time
|
last_print = world.time
|
||||||
sleep(1 SECONDS)
|
sleep(1 SECONDS)
|
||||||
var/obj/item/weapon/paper/R = new(loc)
|
var/obj/item/weapon/paper/R = new(loc)
|
||||||
|
|||||||
@@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
/obj/item/movable_machinery/proc/deploy()
|
/obj/item/movable_machinery/proc/deploy()
|
||||||
if(!machine)
|
if(!machine)
|
||||||
visible_message("\the [src] vanishes into thin air. contact an administrator.")
|
visible_message("\The [src] vanishes into thin air. contact an administrator.")
|
||||||
message_admins("\the [src] somehow didn't have the machine var set. this should never happen.")
|
message_admins("\The [src] somehow didn't have the machine var set. this should never happen.")
|
||||||
qdel(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
machine.forceMove(get_turf(src))
|
machine.forceMove(get_turf(src))
|
||||||
@@ -40,8 +40,8 @@
|
|||||||
//if this ever applies to more than just dispensers, make sure you check for living occupants and shit so they don't get deleted
|
//if this ever applies to more than just dispensers, make sure you check for living occupants and shit so they don't get deleted
|
||||||
..()
|
..()
|
||||||
if(!machine)
|
if(!machine)
|
||||||
visible_message("\the [src] vanishes into thin air. contact an administrator.")
|
visible_message("\The [src] vanishes into thin air. contact an administrator.")
|
||||||
message_admins("\the [src] somehow didn't have the machine var set. this should never happen.")
|
message_admins("\The [src] somehow didn't have the machine var set. this should never happen.")
|
||||||
qdel(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
machine.forceMove(get_turf(src))
|
machine.forceMove(get_turf(src))
|
||||||
|
|||||||
@@ -229,7 +229,7 @@
|
|||||||
|
|
||||||
else
|
else
|
||||||
//visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
|
//visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
|
||||||
user.visible_message("<span class='notice'>\the [usr] starts cutting hair off \the [src].</span>", "<span class='notice'>You start cutting the hair off \the [src].</span>", "You hear the sound of a knife rubbing against flesh.")
|
user.visible_message("<span class='notice'>\The [usr] starts cutting hair off \the [src].</span>", "<span class='notice'>You start cutting the hair off \the [src].</span>", "You hear the sound of a knife rubbing against flesh.")
|
||||||
|
|
||||||
spawn()
|
spawn()
|
||||||
if(do_after(user, src, 5 SECONDS))
|
if(do_after(user, src, 5 SECONDS))
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
..()
|
..()
|
||||||
if(istype(W, /obj/item/device/toner))
|
if(istype(W, /obj/item/device/toner))
|
||||||
if(ink)
|
if(ink)
|
||||||
to_chat(user, "<span class='notice'>\the [name] already contains \a [ink].</span>")
|
to_chat(user, "<span class='notice'>\The [name] already contains \a [ink].</span>")
|
||||||
return
|
return
|
||||||
if(user.drop_item(W, src))
|
if(user.drop_item(W, src))
|
||||||
to_chat(user, "<span class='notice'>You install \the [W] into \the [name].</span>")
|
to_chat(user, "<span class='notice'>You install \the [W] into \the [name].</span>")
|
||||||
|
|||||||
@@ -120,6 +120,6 @@
|
|||||||
|
|
||||||
/obj/item/weapon/soap/attack(var/mob/target, var/mob/user)
|
/obj/item/weapon/soap/attack(var/mob/target, var/mob/user)
|
||||||
if(target && user && ishuman(target) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" )
|
if(target && user && ishuman(target) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" )
|
||||||
user.visible_message("<span class='warning'>\the [user] washes \the [target]'s mouth out with soap!</span>")
|
user.visible_message("<span class='warning'>\The [user] washes \the [target]'s mouth out with soap!</span>")
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -34,10 +34,10 @@
|
|||||||
if(istype(W, /obj/item/weapon/storage/bag/gadgets)) //I guess this allows for moving stuff between RPEDs, honk.
|
if(istype(W, /obj/item/weapon/storage/bag/gadgets)) //I guess this allows for moving stuff between RPEDs, honk.
|
||||||
var/obj/item/weapon/storage/bag/gadgets/A = W
|
var/obj/item/weapon/storage/bag/gadgets/A = W
|
||||||
if(A.contents.len <= 0)
|
if(A.contents.len <= 0)
|
||||||
to_chat(user, "<span class='notify'>\the [A] is empty!</span>")
|
to_chat(user, "<span class='notify'>\The [A] is empty!</span>")
|
||||||
return 1
|
return 1
|
||||||
if(src.contents.len >= storage_slots)
|
if(src.contents.len >= storage_slots)
|
||||||
to_chat(user, "<span class='notify'>\the [src] is full!</span>")
|
to_chat(user, "<span class='notify'>\The [src] is full!</span>")
|
||||||
return 1
|
return 1
|
||||||
A.mass_remove(src)
|
A.mass_remove(src)
|
||||||
to_chat(user, "<span class='notify'>You fill up \the [src] with \the [A]")
|
to_chat(user, "<span class='notify'>You fill up \the [src] with \the [A]")
|
||||||
|
|||||||
@@ -324,7 +324,7 @@
|
|||||||
|
|
||||||
/obj/structure/bed/chair/vehicle/adminbus/proc/capture_mob(atom/A, var/selfclimb=0)
|
/obj/structure/bed/chair/vehicle/adminbus/proc/capture_mob(atom/A, var/selfclimb=0)
|
||||||
if(passengers.len >= ADMINBUS_MAX_CAPACITY)
|
if(passengers.len >= ADMINBUS_MAX_CAPACITY)
|
||||||
to_chat(A, "<span class='warning'>\the [src] is full!</span>")
|
to_chat(A, "<span class='warning'>\The [src] is full!</span>")
|
||||||
return
|
return
|
||||||
if(unloading)
|
if(unloading)
|
||||||
return
|
return
|
||||||
@@ -341,7 +341,7 @@
|
|||||||
M.update_canmove()
|
M.update_canmove()
|
||||||
passengers += M
|
passengers += M
|
||||||
if(!selfclimb)
|
if(!selfclimb)
|
||||||
to_chat(M, "<span class='warning'>\the [src] picks you up!</span>")
|
to_chat(M, "<span class='warning'>\The [src] picks you up!</span>")
|
||||||
if(occupant)
|
if(occupant)
|
||||||
to_chat(occupant, "[M.name] captured!")
|
to_chat(occupant, "[M.name] captured!")
|
||||||
to_chat(M, "<span class='notice'>Welcome aboard \the [src]. Please keep your hands and arms inside the bus at all times.</span>")
|
to_chat(M, "<span class='notice'>Welcome aboard \the [src]. Please keep your hands and arms inside the bus at all times.</span>")
|
||||||
|
|||||||
@@ -230,9 +230,9 @@
|
|||||||
use_energy(selected.energy_cost, user)
|
use_energy(selected.energy_cost, user)
|
||||||
else
|
else
|
||||||
if(istext(t))
|
if(istext(t))
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s error light flickers: [t]</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s error light flickers: [t]</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s error light flickers.</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s error light flickers.</span>")
|
||||||
|
|
||||||
busy = FALSE
|
busy = FALSE
|
||||||
|
|
||||||
@@ -332,12 +332,12 @@
|
|||||||
..()
|
..()
|
||||||
if(istype(S,/obj/item/stack/rcd_ammo))
|
if(istype(S,/obj/item/stack/rcd_ammo))
|
||||||
if((matter + 10) > max_matter)
|
if((matter + 10) > max_matter)
|
||||||
to_chat(user, "<span class='notice'>\the [src] can't hold any more matter-units.</span>")
|
to_chat(user, "<span class='notice'>\The [src] can't hold any more matter-units.</span>")
|
||||||
return 1
|
return 1
|
||||||
matter += 10
|
matter += 10
|
||||||
S.use(1)
|
S.use(1)
|
||||||
playsound(src, 'sound/machines/click.ogg', 20, 1)
|
playsound(src, 'sound/machines/click.ogg', 20, 1)
|
||||||
to_chat(user, "<span class='notice'>\the [src] now holds [matter]/[max_matter] matter-units.</span>")
|
to_chat(user, "<span class='notice'>\The [src] now holds [matter]/[max_matter] matter-units.</span>")
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
if(S.is_screwdriver(user))
|
if(S.is_screwdriver(user))
|
||||||
@@ -350,7 +350,7 @@
|
|||||||
|
|
||||||
/obj/item/device/rcd/matter/use_energy(var/amount, var/mob/user)
|
/obj/item/device/rcd/matter/use_energy(var/amount, var/mob/user)
|
||||||
matter -= amount
|
matter -= amount
|
||||||
to_chat(user, "<span class='notice'>\the [src] currently holds [matter]/[max_matter] matter-units.")
|
to_chat(user, "<span class='notice'>\The [src] currently holds [matter]/[max_matter] matter-units.")
|
||||||
|
|
||||||
/obj/item/device/rcd/matter/get_energy(var/mob/user)
|
/obj/item/device/rcd/matter/get_energy(var/mob/user)
|
||||||
return matter
|
return matter
|
||||||
|
|||||||
@@ -286,9 +286,9 @@
|
|||||||
use_energy(our_schematic.energy_cost, user)
|
use_energy(our_schematic.energy_cost, user)
|
||||||
else
|
else
|
||||||
if(istext(t))
|
if(istext(t))
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s error light flickers: [t]</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s error light flickers: [t]</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s error light flickers.</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s error light flickers.</span>")
|
||||||
|
|
||||||
busy = FALSE
|
busy = FALSE
|
||||||
return 1
|
return 1
|
||||||
@@ -300,9 +300,9 @@
|
|||||||
use_energy(selected.energy_cost, user)
|
use_energy(selected.energy_cost, user)
|
||||||
else
|
else
|
||||||
if(istext(t))
|
if(istext(t))
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s error light flickers: [t]</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s error light flickers: [t]</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s error light flickers.</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s error light flickers.</span>")
|
||||||
|
|
||||||
busy = FALSE
|
busy = FALSE
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -719,7 +719,7 @@ var/global/ingredientLimit = 10
|
|||||||
if(use_power != MACHINE_POWER_USE_NONE)
|
if(use_power != MACHINE_POWER_USE_NONE)
|
||||||
playsound(src,cookSound,100,1)
|
playsound(src,cookSound,100,1)
|
||||||
else
|
else
|
||||||
visible_message("<span class='notice'>\the [foodname] looks ready to eat!</span>")
|
visible_message("<span class='notice'>\The [foodname] looks ready to eat!</span>")
|
||||||
active = 0
|
active = 0
|
||||||
update_icon()
|
update_icon()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -153,7 +153,7 @@
|
|||||||
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
|
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
visible_message("<span class='warning'>\the [src] rattles and prints out a sheet of paper.</span>", 1)
|
visible_message("<span class='warning'>\The [src] rattles and prints out a sheet of paper.</span>", 1)
|
||||||
|
|
||||||
sleep(1 SECONDS)
|
sleep(1 SECONDS)
|
||||||
|
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ emp_act
|
|||||||
/mob/living/carbon/human/emp_act(severity)
|
/mob/living/carbon/human/emp_act(severity)
|
||||||
for(var/obj/item/stickybomb/B in src)
|
for(var/obj/item/stickybomb/B in src)
|
||||||
if(B.stuck_to)
|
if(B.stuck_to)
|
||||||
visible_message("<span class='warning'>\the [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
visible_message("<span class='warning'>\The [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
||||||
B.deactivate()
|
B.deactivate()
|
||||||
B.unstick()
|
B.unstick()
|
||||||
|
|
||||||
|
|||||||
@@ -348,7 +348,7 @@
|
|||||||
/mob/living/carbon/monkey/emp_act(severity)
|
/mob/living/carbon/monkey/emp_act(severity)
|
||||||
for(var/obj/item/stickybomb/B in src)
|
for(var/obj/item/stickybomb/B in src)
|
||||||
if(B.stuck_to)
|
if(B.stuck_to)
|
||||||
visible_message("<span class='warning'>\the [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
visible_message("<span class='warning'>\The [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
||||||
B.deactivate()
|
B.deactivate()
|
||||||
B.unstick()
|
B.unstick()
|
||||||
|
|
||||||
|
|||||||
@@ -224,7 +224,7 @@
|
|||||||
/mob/living/carbon/slime/emp_act(severity)
|
/mob/living/carbon/slime/emp_act(severity)
|
||||||
for(var/obj/item/stickybomb/B in src)
|
for(var/obj/item/stickybomb/B in src)
|
||||||
if(B.stuck_to)
|
if(B.stuck_to)
|
||||||
visible_message("<span class='warning'>\the [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
visible_message("<span class='warning'>\The [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
||||||
B.deactivate()
|
B.deactivate()
|
||||||
B.unstick()
|
B.unstick()
|
||||||
|
|
||||||
|
|||||||
@@ -433,7 +433,7 @@
|
|||||||
/mob/living/emp_act(severity)
|
/mob/living/emp_act(severity)
|
||||||
for(var/obj/item/stickybomb/B in src)
|
for(var/obj/item/stickybomb/B in src)
|
||||||
if(B.stuck_to)
|
if(B.stuck_to)
|
||||||
visible_message("<span class='warning'>\the [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
visible_message("<span class='warning'>\The [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
||||||
B.deactivate()
|
B.deactivate()
|
||||||
B.unstick()
|
B.unstick()
|
||||||
|
|
||||||
@@ -860,7 +860,7 @@ Thanks.
|
|||||||
if(!istype(CM) || !CM.handcuffed)
|
if(!istype(CM) || !CM.handcuffed)
|
||||||
var/datum/chain/tether_datum = L.tether.chain_datum
|
var/datum/chain/tether_datum = L.tether.chain_datum
|
||||||
if(tether_datum.extremity_B == src)
|
if(tether_datum.extremity_B == src)
|
||||||
L.visible_message("<span class='danger'>\the [L] quickly grabs and removes \the [L.tether] tethered to his body!</span>",
|
L.visible_message("<span class='danger'>\The [L] quickly grabs and removes \the [L.tether] tethered to his body!</span>",
|
||||||
"<span class='warning'>You quickly grab and remove \the [L.tether] tethered to your body.</span>")
|
"<span class='warning'>You quickly grab and remove \the [L.tether] tethered to your body.</span>")
|
||||||
L.tether = null
|
L.tether = null
|
||||||
tether_datum.extremity_B = null
|
tether_datum.extremity_B = null
|
||||||
@@ -869,7 +869,7 @@ Thanks.
|
|||||||
//Trying to unstick a stickybomb
|
//Trying to unstick a stickybomb
|
||||||
for(var/obj/item/stickybomb/B in L)
|
for(var/obj/item/stickybomb/B in L)
|
||||||
if(B.stuck_to)
|
if(B.stuck_to)
|
||||||
L.visible_message("<span class='danger'>\the [L] is trying to reach and pull off \the [B] stuck on his body!</span>",
|
L.visible_message("<span class='danger'>\The [L] is trying to reach and pull off \the [B] stuck on his body!</span>",
|
||||||
"<span class='warning'>You reach for \the [B] stuck on your body and start pulling.</span>")
|
"<span class='warning'>You reach for \the [B] stuck on your body and start pulling.</span>")
|
||||||
if(do_after(L, src, 30, 10, FALSE))
|
if(do_after(L, src, 30, 10, FALSE))
|
||||||
L.visible_message("<span class='danger'>After struggling for an instant, \the [L] manages unstick \the [B] from his body!</span>",
|
L.visible_message("<span class='danger'>After struggling for an instant, \the [L] manages unstick \the [B] from his body!</span>",
|
||||||
|
|||||||
@@ -130,7 +130,7 @@
|
|||||||
/mob/living/silicon/emp_act(severity)
|
/mob/living/silicon/emp_act(severity)
|
||||||
for(var/obj/item/stickybomb/B in src)
|
for(var/obj/item/stickybomb/B in src)
|
||||||
if(B.stuck_to)
|
if(B.stuck_to)
|
||||||
visible_message("<span class='warning'>\the [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
visible_message("<span class='warning'>\The [B] stuck on \the [src] suddenly deactivates itself and falls to the ground.</span>")
|
||||||
B.deactivate()
|
B.deactivate()
|
||||||
B.unstick()
|
B.unstick()
|
||||||
|
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Knockdown(3)
|
L.Knockdown(3)
|
||||||
L.Stun(3)
|
L.Stun(3)
|
||||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/balloon/attackby(obj/item/W, mob/user)
|
/mob/living/simple_animal/hostile/balloon/attackby(obj/item/W, mob/user)
|
||||||
if(W.sharpness_flags & (SHARP_TIP|HOT_EDGE))
|
if(W.sharpness_flags & (SHARP_TIP|HOT_EDGE))
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
if(istype(L))
|
if(istype(L))
|
||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Stun(1)
|
L.Stun(1)
|
||||||
L.visible_message("<span class='danger'>\the [src] scares \the [L]!</span>")
|
L.visible_message("<span class='danger'>\The [src] scares \the [L]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/scarybat/cult
|
/mob/living/simple_animal/hostile/scarybat/cult
|
||||||
faction = "cult"
|
faction = "cult"
|
||||||
|
|||||||
@@ -102,7 +102,7 @@
|
|||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Knockdown(3)
|
L.Knockdown(3)
|
||||||
L.Stun(3)
|
L.Stun(3)
|
||||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/carp/baby
|
/mob/living/simple_animal/hostile/carp/baby
|
||||||
desc = "A ferocious, fang-bearing creature that resembles a fish. This one, despite not being mature yet, is just as agressive as any of its brethren."
|
desc = "A ferocious, fang-bearing creature that resembles a fish. This one, despite not being mature yet, is just as agressive as any of its brethren."
|
||||||
|
|||||||
@@ -53,7 +53,7 @@
|
|||||||
if(prob(12))
|
if(prob(12))
|
||||||
L.Knockdown(3)
|
L.Knockdown(3)
|
||||||
L.Stun(3)
|
L.Stun(3)
|
||||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/faithless/cult
|
/mob/living/simple_animal/hostile/faithless/cult
|
||||||
faction = "cult"
|
faction = "cult"
|
||||||
|
|||||||
@@ -145,7 +145,7 @@
|
|||||||
var/mob/living/L = target
|
var/mob/living/L = target
|
||||||
if(L.reagents)
|
if(L.reagents)
|
||||||
if(prob(poison_per_bite))
|
if(prob(poison_per_bite))
|
||||||
src.visible_message("<span class='warning'>\the [src] injects a powerful toxin!</span>")
|
src.visible_message("<span class='warning'>\The [src] injects a powerful toxin!</span>")
|
||||||
L.reagents.add_reagent(poison_type, poison_per_bite)
|
L.reagents.add_reagent(poison_type, poison_per_bite)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -146,7 +146,7 @@
|
|||||||
icon_state = pick("cocoon1","cocoon2","cocoon3")
|
icon_state = pick("cocoon1","cocoon2","cocoon3")
|
||||||
|
|
||||||
/obj/effect/spider/cocoon/Destroy()
|
/obj/effect/spider/cocoon/Destroy()
|
||||||
src.visible_message("<span class='warning'>\the [src] splits open.</span>")
|
src.visible_message("<span class='warning'>\The [src] splits open.</span>")
|
||||||
for(var/atom/movable/A in contents)
|
for(var/atom/movable/A in contents)
|
||||||
A.forceMove(src.loc)
|
A.forceMove(src.loc)
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -132,7 +132,7 @@
|
|||||||
fed--
|
fed--
|
||||||
var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
|
var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
|
||||||
if(!E)
|
if(!E)
|
||||||
visible_message("<span class='notice'>\the [src] begins to lay a cluster of eggs.</span>")
|
visible_message("<span class='notice'>\The [src] begins to lay a cluster of eggs.</span>")
|
||||||
stop_automated_movement = 1
|
stop_automated_movement = 1
|
||||||
if(do_after(src,loc, 50))
|
if(do_after(src,loc, 50))
|
||||||
E = locate() in get_turf(src)
|
E = locate() in get_turf(src)
|
||||||
@@ -149,7 +149,7 @@
|
|||||||
return
|
return
|
||||||
if(locate(/obj/effect/spider/cocoon) in cocoon_target.loc)
|
if(locate(/obj/effect/spider/cocoon) in cocoon_target.loc)
|
||||||
return
|
return
|
||||||
visible_message("<span class='notice'>\the [src] begins to secrete a sticky substance around \the [cocoon_target].</span>")
|
visible_message("<span class='notice'>\The [src] begins to secrete a sticky substance around \the [cocoon_target].</span>")
|
||||||
stop_automated_movement = 1
|
stop_automated_movement = 1
|
||||||
if(do_after(src,cocoon_target, 50))
|
if(do_after(src,cocoon_target, 50))
|
||||||
var/obj/effect/spider/cocoon/C = new(cocoon_target.loc)
|
var/obj/effect/spider/cocoon/C = new(cocoon_target.loc)
|
||||||
@@ -165,7 +165,7 @@
|
|||||||
M.locked_to.unlock_atom(M)
|
M.locked_to.unlock_atom(M)
|
||||||
suffix = "_mob"
|
suffix = "_mob"
|
||||||
fed++
|
fed++
|
||||||
visible_message("<span class='warning'>\the [src] sticks a proboscis into \the [cocoon_target] and secretes a digestive enzyme.</span>")
|
visible_message("<span class='warning'>\The [src] sticks a proboscis into \the [cocoon_target] and secretes a digestive enzyme.</span>")
|
||||||
M.adjustToxLoss(85)
|
M.adjustToxLoss(85)
|
||||||
M.forceMove(C)
|
M.forceMove(C)
|
||||||
C.pixel_x = M.pixel_x
|
C.pixel_x = M.pixel_x
|
||||||
|
|||||||
@@ -648,7 +648,7 @@ var/global/list/protected_objects = list(
|
|||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Knockdown(1)
|
L.Knockdown(1)
|
||||||
L.Stun(1)
|
L.Stun(1)
|
||||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
||||||
|
|
||||||
|
|
||||||
/datum/locking_category/mimic
|
/datum/locking_category/mimic
|
||||||
|
|||||||
@@ -368,14 +368,14 @@
|
|||||||
/mob/living/simple_animal/hostile/pulse_demon/bullet_act(var/obj/item/projectile/Proj)
|
/mob/living/simple_animal/hostile/pulse_demon/bullet_act(var/obj/item/projectile/Proj)
|
||||||
if(istype(Proj,/obj/item/projectile/ion))
|
if(istype(Proj,/obj/item/projectile/ion))
|
||||||
return ..()
|
return ..()
|
||||||
visible_message("<span class ='warning'>\the [Proj] goes right through \the [src]!</span>")
|
visible_message("<span class ='warning'>\The [Proj] goes right through \the [src]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/pulse_demon/vine_protected()
|
/mob/living/simple_animal/hostile/pulse_demon/vine_protected()
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/pulse_demon/hitby(atom/movable/AM, speed, dir, list/hit_whitelist)
|
/mob/living/simple_animal/hostile/pulse_demon/hitby(atom/movable/AM, speed, dir, list/hit_whitelist)
|
||||||
if(!is_under_tile())
|
if(!is_under_tile())
|
||||||
visible_message("<span class ='notice'>\the [AM] goes right through \the [src]!</span>")
|
visible_message("<span class ='notice'>\The [AM] goes right through \the [src]!</span>")
|
||||||
|
|
||||||
// Unless...
|
// Unless...
|
||||||
/mob/living/simple_animal/hostile/pulse_demon/Crossed(atom/movable/AM)
|
/mob/living/simple_animal/hostile/pulse_demon/Crossed(atom/movable/AM)
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Knockdown(3)
|
L.Knockdown(3)
|
||||||
L.Stun(3)
|
L.Stun(3)
|
||||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/tree/death(var/gibbed = FALSE)
|
/mob/living/simple_animal/hostile/tree/death(var/gibbed = FALSE)
|
||||||
..(gibbed)
|
..(gibbed)
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
var/datum/painting_utensil/p = new(user, W)
|
var/datum/painting_utensil/p = new(user, W)
|
||||||
if (p.palette.len)
|
if (p.palette.len)
|
||||||
if (protected_by_glass)
|
if (protected_by_glass)
|
||||||
to_chat(usr, "<span class='warning'>\the [name]'s glass cover stops you from painting on it.</span>")
|
to_chat(usr, "<span class='warning'>\The [name]'s glass cover stops you from painting on it.</span>")
|
||||||
else
|
else
|
||||||
painting_data.interact(user, p)
|
painting_data.interact(user, p)
|
||||||
|
|
||||||
@@ -130,7 +130,7 @@
|
|||||||
// Cleaning
|
// Cleaning
|
||||||
if (istype(W, /obj/item/weapon/soap) && !protected_by_glass)
|
if (istype(W, /obj/item/weapon/soap) && !protected_by_glass)
|
||||||
if (protected_by_glass)
|
if (protected_by_glass)
|
||||||
to_chat(usr, "<span class='warning'>\the [name]'s glass cover stops you from cleaning it off.</span>")
|
to_chat(usr, "<span class='warning'>\The [name]'s glass cover stops you from cleaning it off.</span>")
|
||||||
else
|
else
|
||||||
to_chat(usr, "<span class='warning'>You start cleaning \the [name].</span>")
|
to_chat(usr, "<span class='warning'>You start cleaning \the [name].</span>")
|
||||||
if (do_after(user, src, 20))
|
if (do_after(user, src, 20))
|
||||||
@@ -151,7 +151,7 @@
|
|||||||
if (do_after(user, src, 6))
|
if (do_after(user, src, 6))
|
||||||
if (protected_by_glass)
|
if (protected_by_glass)
|
||||||
protected_by_glass = FALSE
|
protected_by_glass = FALSE
|
||||||
to_chat(usr, "<span class='warning'>\the [name]'s glass cover pops out and breaks!.</span>")
|
to_chat(usr, "<span class='warning'>\The [name]'s glass cover pops out and breaks!.</span>")
|
||||||
playsound(src, "shatter", 50, TRUE)
|
playsound(src, "shatter", 50, TRUE)
|
||||||
var/obj/item/stack/sheet/glass/glass/GS = new(user.loc, 1)
|
var/obj/item/stack/sheet/glass/glass/GS = new(user.loc, 1)
|
||||||
materials.removeAmount(GS.mat_type, GS.perunit)
|
materials.removeAmount(GS.mat_type, GS.perunit)
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
// Protecting with glass
|
// Protecting with glass
|
||||||
if (istype(W, /obj/item/stack/sheet/glass/glass) && !protected_by_glass)
|
if (istype(W, /obj/item/stack/sheet/glass/glass) && !protected_by_glass)
|
||||||
if (!framed)
|
if (!framed)
|
||||||
to_chat(usr, "<span class='warning'>\the [name] needs a frame to hold the glass sheet.</span>")
|
to_chat(usr, "<span class='warning'>\The [name] needs a frame to hold the glass sheet.</span>")
|
||||||
else
|
else
|
||||||
var/obj/item/stack/sheet/glass/glass/GS = W
|
var/obj/item/stack/sheet/glass/glass/GS = W
|
||||||
GS.use(1)
|
GS.use(1)
|
||||||
@@ -313,7 +313,7 @@
|
|||||||
var/datum/painting_utensil/p = new(user, W)
|
var/datum/painting_utensil/p = new(user, W)
|
||||||
if (p.palette.len)
|
if (p.palette.len)
|
||||||
if (protected_by_glass)
|
if (protected_by_glass)
|
||||||
to_chat(usr, "<span class='warning'>\the [name]'s glass cover stops you from painting on it.</span>")
|
to_chat(usr, "<span class='warning'>\The [name]'s glass cover stops you from painting on it.</span>")
|
||||||
else
|
else
|
||||||
painting_data.interact(user, p)
|
painting_data.interact(user, p)
|
||||||
|
|
||||||
@@ -371,7 +371,7 @@
|
|||||||
// Cleaning
|
// Cleaning
|
||||||
if (istype(W, /obj/item/weapon/soap) && !protected_by_glass)
|
if (istype(W, /obj/item/weapon/soap) && !protected_by_glass)
|
||||||
if (protected_by_glass)
|
if (protected_by_glass)
|
||||||
to_chat(usr, "<span class='warning'>\the [name]'s glass cover stops you from cleaning it off.</span>")
|
to_chat(usr, "<span class='warning'>\The [name]'s glass cover stops you from cleaning it off.</span>")
|
||||||
else
|
else
|
||||||
to_chat(usr, "<span class='warning'>You start cleaning \the [name].</span>")
|
to_chat(usr, "<span class='warning'>You start cleaning \the [name].</span>")
|
||||||
if (do_after(user, src, 20))
|
if (do_after(user, src, 20))
|
||||||
@@ -392,7 +392,7 @@
|
|||||||
if (do_after(user, src, 6))
|
if (do_after(user, src, 6))
|
||||||
if (protected_by_glass)
|
if (protected_by_glass)
|
||||||
protected_by_glass = FALSE
|
protected_by_glass = FALSE
|
||||||
to_chat(usr, "<span class='notice'>\the [name]'s glass cover pops out!</span>")
|
to_chat(usr, "<span class='notice'>\The [name]'s glass cover pops out!</span>")
|
||||||
var/obj/item/stack/sheet/glass/glass/GS = new(user.loc, 1)
|
var/obj/item/stack/sheet/glass/glass/GS = new(user.loc, 1)
|
||||||
materials.removeAmount(GS.mat_type, GS.perunit)
|
materials.removeAmount(GS.mat_type, GS.perunit)
|
||||||
GS.forceMove(user.loc)
|
GS.forceMove(user.loc)
|
||||||
@@ -406,7 +406,7 @@
|
|||||||
// Protecting with glass
|
// Protecting with glass
|
||||||
if (istype(W, /obj/item/stack/sheet/glass/glass) && !protected_by_glass)
|
if (istype(W, /obj/item/stack/sheet/glass/glass) && !protected_by_glass)
|
||||||
if (!framed)
|
if (!framed)
|
||||||
to_chat(usr, "<span class='warning'>\the [name] needs a frame to hold the glass sheet.</span>")
|
to_chat(usr, "<span class='warning'>\The [name] needs a frame to hold the glass sheet.</span>")
|
||||||
else
|
else
|
||||||
var/obj/item/stack/sheet/glass/glass/GS = W
|
var/obj/item/stack/sheet/glass/glass/GS = W
|
||||||
GS.use(1)
|
GS.use(1)
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
if(anchored)
|
if(anchored)
|
||||||
to_chat(usr, "<span class='notify'>\the [src] is anchored to the floor!</span>")
|
to_chat(usr, "<span class='notify'>\The [src] is anchored to the floor!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
dir = turn(dir, -90)
|
dir = turn(dir, -90)
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
if(anchored)
|
if(anchored)
|
||||||
to_chat(usr, "<span class='notify'>\the [src] is anchored to the floor!</span>")
|
to_chat(usr, "<span class='notify'>\The [src] is anchored to the floor!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
dir = turn(dir, 90)
|
dir = turn(dir, 90)
|
||||||
|
|||||||
@@ -97,7 +97,7 @@
|
|||||||
if((exact && (AC.type == text2path(ammo_type))) || (!exact && (AC.caliber == caliber)))
|
if((exact && (AC.type == text2path(ammo_type))) || (!exact && (AC.caliber == caliber)))
|
||||||
accepted = 1
|
accepted = 1
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>\the [AC] does not fit into [src]. </span>")
|
to_chat(user, "<span class='warning'>\The [AC] does not fit into [src]. </span>")
|
||||||
return
|
return
|
||||||
if(AC.BB && accepted && stored_ammo.len < max_ammo)
|
if(AC.BB && accepted && stored_ammo.len < max_ammo)
|
||||||
if(user.drop_item(A, src, failmsg = TRUE))
|
if(user.drop_item(A, src, failmsg = TRUE))
|
||||||
|
|||||||
@@ -167,7 +167,7 @@
|
|||||||
animate(src, alpha=50, time=300)
|
animate(src, alpha=50, time=300)
|
||||||
|
|
||||||
else if(isliving(A))
|
else if(isliving(A))
|
||||||
visible_message("<span class='warning'>\the [src] sticks itself on \the [A].</span>")
|
visible_message("<span class='warning'>\The [src] sticks itself on \the [A].</span>")
|
||||||
src.forceMove(A)
|
src.forceMove(A)
|
||||||
self_overlay = new(icon,src,icon_state,10,dir)
|
self_overlay = new(icon,src,icon_state,10,dir)
|
||||||
self_overlay.pixel_x = pixel_x
|
self_overlay.pixel_x = pixel_x
|
||||||
|
|||||||
@@ -487,7 +487,7 @@
|
|||||||
var/mob/living/simple_animal/bee/BEE = new bee_type(T,null)
|
var/mob/living/simple_animal/bee/BEE = new bee_type(T,null)
|
||||||
if(istype(A,/mob/living))
|
if(istype(A,/mob/living))
|
||||||
var/mob/living/M = A
|
var/mob/living/M = A
|
||||||
visible_message("<span class='warning'>\the [M.name] is hit by \the [src.name] in the [parse_zone(def_zone)]!</span>")
|
visible_message("<span class='warning'>\The [M.name] is hit by \the [src.name] in the [parse_zone(def_zone)]!</span>")
|
||||||
M.bullet_act(src, def_zone)
|
M.bullet_act(src, def_zone)
|
||||||
admin_warn(M)
|
admin_warn(M)
|
||||||
BEE.forceMove(M.loc)
|
BEE.forceMove(M.loc)
|
||||||
|
|||||||
@@ -114,13 +114,13 @@
|
|||||||
if(istype(A,/mob/living))
|
if(istype(A,/mob/living))
|
||||||
var/mob/living/M = A
|
var/mob/living/M = A
|
||||||
M.take_overall_damage(5,0)
|
M.take_overall_damage(5,0)
|
||||||
to_chat(M, "<span class='warning'>\the [src]'s tidal force rips your skin!</span>")
|
to_chat(M, "<span class='warning'>\The [src]'s tidal force rips your skin!</span>")
|
||||||
|
|
||||||
for(var/mob/living/L in loc)//standing right in the center of the gravity well means double damage
|
for(var/mob/living/L in loc)//standing right in the center of the gravity well means double damage
|
||||||
if((L.stat == DEAD) && prob(5))
|
if((L.stat == DEAD) && prob(5))
|
||||||
L.gib()
|
L.gib()
|
||||||
L.take_overall_damage(3,0)//less brute damage in the center, but the radiations caused by singularity_pull make up for it.
|
L.take_overall_damage(3,0)//less brute damage in the center, but the radiations caused by singularity_pull make up for it.
|
||||||
to_chat(L, "<span class='danger'>\the [src]'s tidal force is crushing you!</span>")
|
to_chat(L, "<span class='danger'>\The [src]'s tidal force is crushing you!</span>")
|
||||||
|
|
||||||
sleep(10)
|
sleep(10)
|
||||||
Pulse()
|
Pulse()
|
||||||
|
|||||||
@@ -251,21 +251,21 @@
|
|||||||
if(istype(A,/mob/living/carbon/human))
|
if(istype(A,/mob/living/carbon/human))
|
||||||
var/mob/living/carbon/human/H = A
|
var/mob/living/carbon/human/H = A
|
||||||
if(istype(H.wear_suit,/obj/item/clothing/suit/armor/laserproof))// bwoing!!
|
if(istype(H.wear_suit,/obj/item/clothing/suit/armor/laserproof))// bwoing!!
|
||||||
visible_message("<span class='warning'>\the [src.name] bounces off \the [A.name]'s [H.wear_suit]!</span>")
|
visible_message("<span class='warning'>\The [src.name] bounces off \the [A.name]'s [H.wear_suit]!</span>")
|
||||||
bounce()
|
bounce()
|
||||||
else
|
else
|
||||||
visible_message("<span class='warning'>\the [A.name] is hit by \the [src.name] in the [parse_zone(def_zone)]!</span>")
|
visible_message("<span class='warning'>\The [A.name] is hit by \the [src.name] in the [parse_zone(def_zone)]!</span>")
|
||||||
A.bullet_act(src, def_zone)
|
A.bullet_act(src, def_zone)
|
||||||
admin_warn(A)
|
admin_warn(A)
|
||||||
bulletdies(A)
|
bulletdies(A)
|
||||||
else
|
else
|
||||||
visible_message("<span class='warning'>\the [A.name] is hit by \the [src.name] in the [parse_zone(def_zone)]!</span>")
|
visible_message("<span class='warning'>\The [A.name] is hit by \the [src.name] in the [parse_zone(def_zone)]!</span>")
|
||||||
A.bullet_act(src, def_zone)
|
A.bullet_act(src, def_zone)
|
||||||
admin_warn(A)
|
admin_warn(A)
|
||||||
bulletdies(A)
|
bulletdies(A)
|
||||||
|
|
||||||
else if(is_type_in_list(A,ricochet_bump))//beware fuel tanks!
|
else if(is_type_in_list(A,ricochet_bump))//beware fuel tanks!
|
||||||
visible_message("<span class='warning'>\the [A.name] is hit by \the [src.name]!</span>")
|
visible_message("<span class='warning'>\The [A.name] is hit by \the [src.name]!</span>")
|
||||||
A.bullet_act(src)
|
A.bullet_act(src)
|
||||||
bulletdies(A)
|
bulletdies(A)
|
||||||
|
|
||||||
|
|||||||
@@ -610,7 +610,7 @@
|
|||||||
return 0
|
return 0
|
||||||
|
|
||||||
if(contents.len >= storage_slots) //There's a rational limit to this madness people
|
if(contents.len >= storage_slots) //There's a rational limit to this madness people
|
||||||
to_chat(user, "<span class='warning'>\the [src] is already too full to fit \the [W].</span>")
|
to_chat(user, "<span class='warning'>\The [src] is already too full to fit \the [W].</span>")
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
if(user.drop_item(W, src))
|
if(user.drop_item(W, src))
|
||||||
|
|||||||
@@ -491,11 +491,9 @@
|
|||||||
var/mob/mob = get_mob_by_key(mover.fingerprintslast)
|
var/mob/mob = get_mob_by_key(mover.fingerprintslast)
|
||||||
if(prob(75) || (mob?.reagents?.get_sportiness()>=5))
|
if(prob(75) || (mob?.reagents?.get_sportiness()>=5))
|
||||||
I.forceMove(src)
|
I.forceMove(src)
|
||||||
for(var/mob/M in viewers(src))
|
visible_message("\The [I] lands in \the [src].")
|
||||||
M.show_message("\the [I] lands in \the [src].", 1)
|
|
||||||
else
|
else
|
||||||
for(var/mob/M in viewers(src))
|
visible_message("\The [I] bounces off of \the [src]'s rim!")
|
||||||
M.show_message("\the [I] bounces off of \the [src]'s rim!", 1)
|
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return ..(mover, target, height, air_group)
|
return ..(mover, target, height, air_group)
|
||||||
|
|||||||
@@ -113,7 +113,7 @@
|
|||||||
if(istype(summons, sacrifice)) //No sacrificing things we've summoned
|
if(istype(summons, sacrifice)) //No sacrificing things we've summoned
|
||||||
if(heal_associates)
|
if(heal_associates)
|
||||||
sacrifice.revive(0)
|
sacrifice.revive(0)
|
||||||
sacrifice.visible_message("<span class='warning'>\the [src] appears to wake from the dead, having healed all wounds.</span>")
|
sacrifice.visible_message("<span class='warning'>\The [src] appears to wake from the dead, having healed all wounds.</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
if(iscarbon(sacrifice))
|
if(iscarbon(sacrifice))
|
||||||
|
|||||||
@@ -208,11 +208,11 @@
|
|||||||
to_chat(user, "<span class='info'>You crowbar the battery panel [open ? "open" : "in place"].</span>")
|
to_chat(user, "<span class='info'>You crowbar the battery panel [open ? "open" : "in place"].</span>")
|
||||||
icon_state = "suspension[anchored ? (open ? (cell ? "1" : "0") : "2") : (open ? (cell ? "1-b" : "0-b") : "2-b")]"
|
icon_state = "suspension[anchored ? (open ? (cell ? "1" : "0") : "2") : (open ? (cell ? "1-b" : "0-b") : "2-b")]"
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s safety locks are engaged, shut it down first.</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s safety locks are engaged, shut it down first.</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>Unscrew \the [src]'s battery panel first.</span>")
|
to_chat(user, "<span class='warning'>Unscrew \the [src]'s battery panel first.</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='warning'>\the [src]'s security locks are engaged.</span>")
|
to_chat(user, "<span class='warning'>\The [src]'s security locks are engaged.</span>")
|
||||||
else if (W.is_wrench(user))
|
else if (W.is_wrench(user))
|
||||||
if(!suspension_field)
|
if(!suspension_field)
|
||||||
if(anchored)
|
if(anchored)
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
var/mob/living/carbon/C = target
|
var/mob/living/carbon/C = target
|
||||||
if ((C.sdisabilities & BLIND) || (C.sight & BLIND))
|
if ((C.sdisabilities & BLIND) || (C.sight & BLIND))
|
||||||
to_chat(user, "<span class='warning'>\the [C] is blind!</span>")
|
to_chat(user, "<span class='warning'>\The [C] is blind!</span>")
|
||||||
return TRUE
|
return TRUE
|
||||||
var/success = C.vampire_affected(user.mind)
|
var/success = C.vampire_affected(user.mind)
|
||||||
switch(success)
|
switch(success)
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
if(W.is_wrench(user))
|
if(W.is_wrench(user))
|
||||||
W.playtoolsound(src, 50)
|
W.playtoolsound(src, 50)
|
||||||
anchored = !anchored
|
anchored = !anchored
|
||||||
to_chat(user, "<span class='caution'>\the [src] [anchored ? "is now secured" : "can now be moved"] .</span>")
|
to_chat(user, "<span class='caution'>\The [src] [anchored ? "is now secured" : "can now be moved"] .</span>")
|
||||||
if(W.is_screwdriver(user))
|
if(W.is_screwdriver(user))
|
||||||
if(stage == 0)
|
if(stage == 0)
|
||||||
W.playtoolsound(src, 50)
|
W.playtoolsound(src, 50)
|
||||||
|
|||||||
@@ -586,7 +586,7 @@ var/global/global_cricket_population = 0
|
|||||||
return
|
return
|
||||||
|
|
||||||
if(alert(user,"Harvest the honeycombs?[((queen_bees_inside || worker_bees_inside) && species.angery) ? " Be ready to handle some angry bees!" : ""]","[name]","Yes","No")== "Yes")
|
if(alert(user,"Harvest the honeycombs?[((queen_bees_inside || worker_bees_inside) && species.angery) ? " Be ready to handle some angry bees!" : ""]","[name]","Yes","No")== "Yes")
|
||||||
user.visible_message("<span class='notice'>\the [user] begins dismantling the apiary.</span>","<span class='danger'>You begin harvesting the honeycombs.</span>")
|
user.visible_message("<span class='notice'>\The [user] begins dismantling the apiary.</span>","<span class='danger'>You begin harvesting the honeycombs.</span>")
|
||||||
|
|
||||||
if((queen_bees_inside || worker_bees_inside) && species.angery)
|
if((queen_bees_inside || worker_bees_inside) && species.angery)
|
||||||
playsound(loc, 'sound/effects/fan.ogg', 75, 1, -1)
|
playsound(loc, 'sound/effects/fan.ogg', 75, 1, -1)
|
||||||
|
|||||||
Reference in New Issue
Block a user