mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-19 03:50:32 +01:00
holy fuck this is a lot
adds: slutcurity belt, slutcurity hailer, security latex gloves, pink security jumpsuit fixes: stripper armor is now in the sec wardrobe, muzzles now properly stop self-removal
This commit is contained in:
Unknown
@@ -38,10 +38,32 @@
|
||||
aggressiveness = 1 //Borgs are nicecurity!
|
||||
actions_types = list(/datum/action/item_action/halt)
|
||||
|
||||
/obj/item/clothing/mask/gas/sechailer/slut
|
||||
name = "slutcurity hailer"
|
||||
desc = "A modified Security gas mask designed for softer apprehension, now with a hot pink paintjob!"
|
||||
icon_state = "sluthailer"
|
||||
item_state = "sluthailer"
|
||||
aggressiveness = 0 //can't have your pets being mean!
|
||||
actions_types = list(/datum/action/item_action/halt)
|
||||
|
||||
/obj/item/clothing/mask/gas/sechailer/slut/attack_hand(mob/user)
|
||||
if(iscarbon(user))
|
||||
var/mob/living/carbon/C = user
|
||||
if(src == C.wear_mask)
|
||||
to_chat(user, "<span class='warning'>The mask is fastened tight! You'll need help taking this off!</span>")
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/clothing/mask/gas/sechailer/screwdriver_act(mob/living/user, obj/item/I)
|
||||
if(..())
|
||||
return TRUE
|
||||
switch(aggressiveness)
|
||||
if(-1)
|
||||
to_chat(user, "<span class='notice'>You set the restrictor to the on position.</span>")
|
||||
aggressiveness = 0
|
||||
if(0)
|
||||
to_chat(user, "<span class='notice'>You set the restrictor to the off position.</span>")
|
||||
aggressiveness = -1
|
||||
if(1)
|
||||
to_chat(user, "<span class='notice'>You set the restrictor to the middle position.</span>")
|
||||
aggressiveness = 2
|
||||
@@ -109,6 +131,10 @@
|
||||
return
|
||||
|
||||
switch(aggressiveness) // checks if the user has unlocked the restricted phrases
|
||||
if(-1)
|
||||
return // the mask will not play anything
|
||||
if(0)
|
||||
phrase = rand(19,24) // the mask will only play 'slut cop' phrases
|
||||
if(1)
|
||||
phrase = rand(1,5) // set the upper limit as the phrase above the first 'bad cop' phrase, the mask will only play 'nice' phrases
|
||||
if(2)
|
||||
@@ -178,8 +204,29 @@
|
||||
if(18)
|
||||
phrase_text = "I am, the LAW!"
|
||||
phrase_sound = "dredd"
|
||||
if(19) // slut cop
|
||||
phrase_text = "Your ass is mine!"
|
||||
phrase_sound = "ass"
|
||||
if(20) //Thank you Yappy for 19 & 20
|
||||
phrase_text = "Your consent is forfeit."
|
||||
phrase_sound = "consent"
|
||||
if(21)
|
||||
phrase_text = "Fuck my brains out, I dare you."
|
||||
phrase_sound = "brains"
|
||||
if(22)
|
||||
phrase_text = "Hands up, pants down."
|
||||
phrase_sound = "pants"
|
||||
if(23)
|
||||
phrase_text = "On your knees, and say please."
|
||||
phrase_sound = "knees"
|
||||
if(24) //Thank you Nata for 22-24
|
||||
phrase_text = "Empty or not, I'm cumming for you!"
|
||||
phrase_sound = "empty"
|
||||
|
||||
usr.audible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[phrase_text]</b></font>")
|
||||
if(aggressiveness == 0)
|
||||
usr.audible_message("[usr]'s Compli-o-Nator: <font color=#D45592 size='2'><b>[phrase_text]</b></font>")
|
||||
else
|
||||
usr.audible_message("[usr]'s Compli-o-Nator: <font color='red' size='4'><b>[phrase_text]</b></font>")
|
||||
playsound(src.loc, "sound/voice/complionator/[phrase_sound].ogg", 100, 0, 4)
|
||||
cooldown = world.time
|
||||
cooldown_special = world.time
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
equip_delay_other = 20
|
||||
mutantrace_variation = MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/mask/muzzle/attack_paw(mob/user)
|
||||
/obj/item/clothing/mask/muzzle/attack_hand(mob/user)
|
||||
if(iscarbon(user))
|
||||
var/mob/living/carbon/C = user
|
||||
if(src == C.wear_mask)
|
||||
|
||||
@@ -24,6 +24,12 @@
|
||||
icon_state = "security"
|
||||
item_state = "gy_suit"
|
||||
item_color = "security"
|
||||
/obj/item/clothing/under/rank/security/pink
|
||||
name = "pink security jumpsuit"
|
||||
desc = "A tactical security jumpsuit for officers that screw up their laundry."
|
||||
icon_state = "rsecuritypink"
|
||||
item_state = "r_suit"
|
||||
item_color = "rsecuritypink"
|
||||
/obj/item/clothing/under/rank/security/skirt
|
||||
name = "security jumpskirt"
|
||||
desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
|
||||
@@ -40,6 +46,10 @@
|
||||
item_state = "secslutskirt"
|
||||
item_color = null //i dont understand what item_color even is, apparently setting it to null means it won't change color in a washing machine?
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION //look at the first two comments in vg_under.dm
|
||||
/obj/item/clothing/under/rank/security/skirt/slut/pink
|
||||
desc = "A \"\"\"tactical\"\"\" security jumpsuit with the legs replaced by a skirt. No matter how you adjust it, it always feels a little too small. This one seems to have an experimental color scheme."
|
||||
icon_state = "secslutskirtpink"
|
||||
item_state = "secslutskirtpink"
|
||||
/obj/item/clothing/under/rank/security/stripper
|
||||
name = "security stripper outfit"
|
||||
desc = "This can't be dress code compliant, can it?"
|
||||
|
||||
@@ -274,7 +274,7 @@
|
||||
loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing
|
||||
|
||||
/mob/living/carbon/is_muzzled()
|
||||
return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
|
||||
return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle)||istype(src.wear_mask, /obj/item/clothing/mask/gas/sechailer/slut)) //i sure do love snowflake code
|
||||
|
||||
/mob/living/carbon/hallucinating()
|
||||
if(hallucination)
|
||||
|
||||
@@ -17,8 +17,12 @@
|
||||
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
|
||||
/obj/item/storage/fancy/donut_box = 2,
|
||||
/obj/item/ssword_kit = 1,
|
||||
/obj/item/clothing/neck/petcollar/locked/security = 3,
|
||||
/obj/item/electropack/shockcollar/security = 3)
|
||||
/obj/item/clothing/suit/armor/vest/stripper = 5,
|
||||
/obj/item/clothing/suit/armor/vest/stripper/bikini = 5,
|
||||
/obj/item/clothing/neck/petcollar/locked/security = 5,
|
||||
/obj/item/electropack/shockcollar/security = 5,
|
||||
/obj/item/storage/belt/slut = 5,
|
||||
/obj/item/clothing/mask/gas/sechailer/slut = 5)
|
||||
premium = list(/obj/item/coin/antagtoken = 1,
|
||||
/obj/item/clothing/head/helmet/blueshirt = 1,
|
||||
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
|
||||
|
||||
@@ -22,10 +22,13 @@
|
||||
premium = list(/obj/item/clothing/under/rank/security/navyblue = 5,
|
||||
/obj/item/clothing/suit/security/officer = 5,
|
||||
/obj/item/clothing/head/beret/sec/navyofficer = 5,
|
||||
/obj/item/clothing/under/rank/security/skirt/slut = 3,
|
||||
/obj/item/clothing/under/rank/security/stripper = 3,
|
||||
/obj/item/clothing/shoes/jackboots/tall = 3,
|
||||
/obj/item/clothing/head/beret/sec/bitch = 3)
|
||||
/obj/item/clothing/under/rank/security/pink = 5,
|
||||
/obj/item/clothing/under/rank/security/skirt/slut = 5,
|
||||
/obj/item/clothing/under/rank/security/skirt/slut/pink = 5,
|
||||
/obj/item/clothing/under/rank/security/stripper = 5,
|
||||
/obj/item/clothing/shoes/jackboots/tall = 5,
|
||||
/obj/item/clothing/head/beret/sec/bitch = 5,
|
||||
/obj/item/clothing/gloves/latexsleeves/security = 5)
|
||||
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
|
||||
|
||||
/obj/item/vending_refill/wardrobe/sec_wardrobe
|
||||
|
||||
Reference in New Issue
Block a user