Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
This commit is contained in:
Ghommie
@@ -24,7 +24,7 @@
|
||||
. += "<span class='notice'>[DisplayTimeText(nextadrenalinepop - world.time)] left before the adrenaline injector can be used again."
|
||||
|
||||
/obj/item/clothing/glasses/phantomthief/syndicate/proc/injectadrenaline(mob/living/user, was_forced = FALSE)
|
||||
if(user.combat_flags & COMBAT_FLAG_COMBAT_TOGGLED && world.time >= nextadrenalinepop)
|
||||
if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_TOGGLED) && world.time >= nextadrenalinepop)
|
||||
nextadrenalinepop = world.time + 5 MINUTES
|
||||
user.reagents.add_reagent(/datum/reagent/syndicateadrenals, 5)
|
||||
user.playsound_local(user, 'sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
|
||||
|
||||
@@ -13,6 +13,53 @@
|
||||
custom_price = 1200
|
||||
custom_premium_price = 1200
|
||||
|
||||
/obj/item/toy/sprayoncan
|
||||
name = "spray-on insulation applicator"
|
||||
desc = "What is the number one problem facing our station today?"
|
||||
icon = 'icons/obj/clothing/gloves.dmi'
|
||||
icon_state = "sprayoncan"
|
||||
|
||||
/obj/item/toy/sprayoncan/afterattack(atom/target, mob/living/carbon/user, proximity)
|
||||
if(iscarbon(target) && proximity)
|
||||
var/mob/living/carbon/C = target
|
||||
var/mob/living/carbon/U = user
|
||||
var/success = C.equip_to_slot_if_possible(new /obj/item/clothing/gloves/color/yellow/sprayon, ITEM_SLOT_GLOVES, TRUE, TRUE)
|
||||
if(success)
|
||||
if(C == user)
|
||||
C.visible_message("<span class='notice'>[U] sprays their hands with glittery rubber!</span>")
|
||||
else
|
||||
C.visible_message("<span class='warning'>[U] sprays glittery rubber on the hands of [C]!</span>")
|
||||
else
|
||||
C.visible_message("<span class='warning'>The rubber fails to stick to [C]'s hands!</span>")
|
||||
|
||||
qdel(src)
|
||||
|
||||
/obj/item/clothing/gloves/color/yellow/sprayon
|
||||
desc = "How're you gonna get 'em off, nerd?"
|
||||
name = "spray-on insulated gloves"
|
||||
icon_state = "sprayon"
|
||||
item_state = "sprayon"
|
||||
permeability_coefficient = 0
|
||||
resistance_flags = ACID_PROOF
|
||||
var/shocks_remaining = 10
|
||||
|
||||
/obj/item/clothing/gloves/color/yellow/sprayon/Initialize()
|
||||
.=..()
|
||||
ADD_TRAIT(src, TRAIT_NODROP, GLOVE_TRAIT)
|
||||
|
||||
/obj/item/clothing/gloves/color/yellow/sprayon/equipped(mob/user, slot)
|
||||
. = ..()
|
||||
RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, .proc/Shocked)
|
||||
|
||||
/obj/item/clothing/gloves/color/yellow/sprayon/proc/Shocked()
|
||||
shocks_remaining--
|
||||
if(shocks_remaining < 0)
|
||||
qdel(src) //if we run out of uses, the gloves crumble away into nothing, just like my dreams after working with .dm
|
||||
|
||||
/obj/item/clothing/gloves/color/yellow/sprayon/dropped()
|
||||
.=..()
|
||||
qdel(src) //loose nodrop items bad
|
||||
|
||||
/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
|
||||
desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
|
||||
name = "budget insulated gloves"
|
||||
@@ -202,6 +249,17 @@
|
||||
permeability_coefficient = 0.3
|
||||
resistance_flags = FIRE_PROOF | ACID_PROOF
|
||||
|
||||
/obj/item/clothing/gloves/color/latex/engineering
|
||||
name = "tinker's gloves"
|
||||
desc = "Overdesigned engineering gloves that have automated construction subrutines dialed in, allowing for faster construction while worn."
|
||||
icon = 'icons/obj/clothing/clockwork_garb.dmi'
|
||||
icon_state = "clockwork_gauntlets"
|
||||
item_state = "clockwork_gauntlets"
|
||||
siemens_coefficient = 0.8
|
||||
permeability_coefficient = 0.3
|
||||
carrytrait = TRAIT_QUICK_BUILD
|
||||
custom_materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000)
|
||||
|
||||
/obj/item/clothing/gloves/color/white
|
||||
name = "white gloves"
|
||||
desc = "These look pretty fancy."
|
||||
|
||||
@@ -60,6 +60,16 @@
|
||||
cold_protection = HEAD
|
||||
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
|
||||
|
||||
/obj/item/clothing/head/hardhat/red/upgraded
|
||||
name = "workplace-ready firefighter helmet"
|
||||
desc = "By applying state of the art lighting technology to a fire helmet, and using photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards."
|
||||
icon_state = "hardhat0_purple"
|
||||
item_state = "hardhat0_purple"
|
||||
brightness_on = 5
|
||||
resistance_flags = FIRE_PROOF | ACID_PROOF
|
||||
custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500)
|
||||
hat_type = "purple"
|
||||
|
||||
/obj/item/clothing/head/hardhat/white
|
||||
icon_state = "hardhat0_white"
|
||||
item_state = "hardhat0_white"
|
||||
|
||||
@@ -198,6 +198,7 @@
|
||||
desc = "A creepy wooden mask. Surprisingly expressive for a poorly carved bit of wood."
|
||||
icon_state = "tiki_eyebrow"
|
||||
item_state = "tiki_eyebrow"
|
||||
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.25)
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 100
|
||||
actions_types = list(/datum/action/item_action/adjust)
|
||||
|
||||
@@ -45,6 +45,7 @@
|
||||
desc = "A pair of rather plain wooden sandals."
|
||||
name = "sandals"
|
||||
icon_state = "wizard"
|
||||
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 0.5)
|
||||
strip_delay = 50
|
||||
equip_delay_other = 50
|
||||
permeability_coefficient = 0.9
|
||||
|
||||
@@ -444,7 +444,6 @@ Contains:
|
||||
desc = "Powerful wards are built into this hardsuit, protecting the user from all manner of paranormal threats. Alas, this one looks pretty worn out and rusted."
|
||||
armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60)
|
||||
slowdown = 0.8
|
||||
obj_flags = IMMUTABLE_SLOW //rest in peace rusty joints.
|
||||
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/old
|
||||
charges = 12
|
||||
|
||||
@@ -470,7 +469,6 @@ Contains:
|
||||
desc = "Voices echo from the hardsuit, driving the user insane. This one is pretty battle-worn, but still fearsome."
|
||||
armor = list("melee" = 55, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 40, "bio" = 80, "rad" = 80, "fire" = 60, "acid" = 60)
|
||||
slowdown = 0.8
|
||||
obj_flags = IMMUTABLE_SLOW //rest in peace rusty joints.
|
||||
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor/old
|
||||
charges = 6
|
||||
|
||||
|
||||
@@ -165,31 +165,134 @@
|
||||
var/robe_charge = TRUE
|
||||
actions_types = list(/datum/action/item_action/stickmen)
|
||||
|
||||
/obj/item/clothing/suit/wizrobe/paper/item_action_slot_check(slot, mob/user, datum/action/A)
|
||||
if(A.type == /datum/action/item_action/stickmen && slot != SLOT_WEAR_SUIT)
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/suit/wizrobe/paper/ui_action_click(mob/user, action)
|
||||
stickmen()
|
||||
//Stickmemes. VV-friendly.
|
||||
/datum/action/item_action/stickmen
|
||||
name = "Summon Stick Minions"
|
||||
desc = "Allows you to summon faithful stickmen allies to aide you in battle."
|
||||
icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
|
||||
button_icon_state = "art_summon"
|
||||
var/ready = TRUE
|
||||
var/list/summoned_stickmen = list()
|
||||
var/summoned_mob_path = /mob/living/simple_animal/hostile/stickman //Must be an hostile animal path.
|
||||
var/max_stickmen = 8
|
||||
var/cooldown = 3 SECONDS
|
||||
var/list/book_of_grudges = list()
|
||||
|
||||
/datum/action/item_action/stickmen/New(Target)
|
||||
..()
|
||||
if(isitem(Target))
|
||||
RegisterSignal(Target, COMSIG_PARENT_EXAMINE, .proc/give_infos)
|
||||
|
||||
/datum/action/item_action/stickmen/Destroy()
|
||||
for(var/A in summoned_stickmen)
|
||||
var/mob/living/simple_animal/hostile/S = A
|
||||
if(S.client)
|
||||
to_chat(S, "<span class='danger'>A dizzying sensation strikes you as the comglomerate of pencil lines you call \
|
||||
your body crumbles under the pressure of an invisible eraser, soon to join bilions discarded sketches. \
|
||||
It seems whatever was keeping you in this realm has come to an end, like all things.</span>")
|
||||
animate(S, alpha = 0, time = 5 SECONDS)
|
||||
QDEL_IN(S, 5 SECONDS)
|
||||
return ..()
|
||||
|
||||
/datum/action/item_action/stickmen/proc/give_infos(atom/source, mob/user, list/examine_list)
|
||||
examine_list += "<span class='notice'>Making sure you are properly wearing or holding it, \
|
||||
point at whatever you want to rally your minions to its position."
|
||||
examine_list += "While on <b>harm</b> intent, pointed mobs (minus you and the minions) \
|
||||
will also be marked as foes for your minions to attack for the next 2 minutes.</span>"
|
||||
|
||||
/datum/action/item_action/stickmen/Grant(mob/M)
|
||||
. = ..()
|
||||
if(owner)
|
||||
RegisterSignal(M, COMSIG_MOB_POINTED, .proc/rally)
|
||||
if(book_of_grudges[M]) //Stop attacking your new master.
|
||||
book_of_grudges -= M
|
||||
for(var/A in summoned_stickmen)
|
||||
var/mob/living/simple_animal/hostile/S = A
|
||||
if(!S.mind)
|
||||
S.LoseTarget()
|
||||
|
||||
|
||||
/obj/item/clothing/suit/wizrobe/paper/verb/stickmen()
|
||||
set category = "Object"
|
||||
set name = "Summon Stick Minions"
|
||||
set src in usr
|
||||
if(!isliving(usr))
|
||||
/datum/action/item_action/stickmen/Remove(mob/M)
|
||||
. = ..()
|
||||
UnregisterSignal(M, COMSIG_MOB_POINTED)
|
||||
|
||||
/datum/action/item_action/stickmen/Trigger()
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
if(!robe_charge)
|
||||
to_chat(usr, "<span class='warning'>\The robe's internal magic supply is still recharging!</span>")
|
||||
if(!ready)
|
||||
to_chat(owner, "<span class='warning'>[src]'s internal magic supply is still recharging!</span>")
|
||||
return FALSE
|
||||
var/summon = TRUE
|
||||
if(length(summoned_stickmen) >= max_stickmen)
|
||||
var/mob/living/simple_animal/hostile/S = popleft(summoned_stickmen)
|
||||
if(!S.client)
|
||||
qdel(S)
|
||||
else
|
||||
S.forceMove(owner.drop_location())
|
||||
S.revive(TRUE)
|
||||
summoned_stickmen[S] = TRUE
|
||||
summon = FALSE
|
||||
|
||||
owner.say("Rise, my creation! Off your page into this realm!", forced = "stickman summoning")
|
||||
playsound(owner, 'sound/magic/summon_magic.ogg', 50, 1, 1)
|
||||
if(summon)
|
||||
var/mob/living/simple_animal/hostile/S = new summoned_mob_path (get_turf(usr))
|
||||
S.faction = owner.faction
|
||||
S.foes = book_of_grudges
|
||||
RegisterSignal(S, COMSIG_PARENT_QDELETING, .proc/remove_from_list)
|
||||
ready = FALSE
|
||||
addtimer(CALLBACK(src, .proc/ready_again), cooldown)
|
||||
|
||||
/datum/action/item_action/stickmen/proc/remove_from_list(datum/source, forced)
|
||||
summoned_stickmen -= source
|
||||
|
||||
/datum/action/item_action/stickmen/proc/ready_again()
|
||||
ready = TRUE
|
||||
if(owner)
|
||||
to_chat(owner, "<span class='notice'>[src] hums, its internal magic supply restored.</span>")
|
||||
|
||||
/**
|
||||
* Rallies your army of stickmen to whichever target the user is pointing.
|
||||
* Should the user be on harm intent and the target be a living mob that's not the user or a fellow stickman,
|
||||
* said target will be added to a list of foes which the stickmen will gladly dispose regardless of faction.
|
||||
* This is designed so stickmen will move toward whatever you point at even when you don't want to, that's the downside.
|
||||
*/
|
||||
/datum/action/item_action/stickmen/proc/rally(mob/source, atom/A)
|
||||
var/turf/T = get_turf(A)
|
||||
var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z))
|
||||
if(!surrounding_turfs.len)
|
||||
return
|
||||
if(source.a_intent == INTENT_HARM && A != source && !summoned_stickmen[A])
|
||||
var/mob/living/L
|
||||
if(isliving(A)) //Gettem boys!
|
||||
L = A
|
||||
else if(ismecha(A))
|
||||
var/obj/mecha/M = A
|
||||
L = M.occupant
|
||||
if(L && L.stat != DEAD && !HAS_TRAIT(L, TRAIT_DEATHCOMA)) //Taking revenge on the deads would be proposterous.
|
||||
addtimer(CALLBACK(src, .proc/clear_grudge, L), 2 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE)
|
||||
if(!book_of_grudges[L])
|
||||
RegisterSignal(L, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_DEATH), .proc/grudge_settled)
|
||||
book_of_grudges[L] = TRUE
|
||||
for(var/k in summoned_stickmen) //Shamelessly copied from the blob rally power
|
||||
var/mob/living/simple_animal/hostile/S = k
|
||||
if(!S.mind && isturf(S.loc) && get_dist(S, T) <= 10)
|
||||
S.LoseTarget()
|
||||
S.Goto(pick(surrounding_turfs), S.move_to_delay)
|
||||
|
||||
usr.say("Rise, my creation! Off your page into this realm!", forced = "stickman summoning")
|
||||
playsound(src.loc, 'sound/magic/summon_magic.ogg', 50, 1, 1)
|
||||
var/mob/living/M = new /mob/living/simple_animal/hostile/stickman(get_turf(usr))
|
||||
var/list/factions = usr.faction
|
||||
M.faction = factions
|
||||
src.robe_charge = FALSE
|
||||
sleep(30)
|
||||
src.robe_charge = TRUE
|
||||
to_chat(usr, "<span class='notice'>\The robe hums, its internal magic supply restored.</span>")
|
||||
/datum/action/item_action/stickmen/proc/clear_grudge(mob/living/L)
|
||||
if(!QDELETED(L))
|
||||
book_of_grudges -= L
|
||||
|
||||
/datum/action/item_action/stickmen/proc/grudge_settled(mob/living/L)
|
||||
UnregisterSignal(L, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_DEATH))
|
||||
book_of_grudges -= L
|
||||
|
||||
//Shielded Armour
|
||||
|
||||
|
||||
Reference in New Issue
Block a user