mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy
This commit is contained in:
Aurorablade
@@ -56,6 +56,9 @@ var/global/list/moneytypes=list(
|
||||
stack.color=stack_color
|
||||
overlays += stack
|
||||
|
||||
/obj/item/weapon/spacecash/proc/get_total()
|
||||
return worth * amount
|
||||
|
||||
/obj/item/weapon/spacecash/c10
|
||||
icon_state = "cash10"
|
||||
worth = 10
|
||||
@@ -105,4 +108,4 @@ var/global/list/moneytypes=list(
|
||||
/proc/count_cash(var/list/cash)
|
||||
. = 0
|
||||
for(var/obj/item/weapon/spacecash/C in cash)
|
||||
. += C.amount * C.worth
|
||||
. += C.get_total()
|
||||
@@ -177,6 +177,13 @@ LIGHTERS ARE IN LIGHTERS.DM
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/item/clothing/mask/cigarette/random
|
||||
|
||||
/obj/item/clothing/mask/cigarette/random/New()
|
||||
..()
|
||||
var/random_reagent = pick("fuel","saltpetre","synaptizine","green_vomit","potass_iodide","msg","lexorin","mannitol","spaceacillin","cryoxadone","holywater","tea","egg","haloperidol","mutagen","omnizine","carpet","aranesp","cryostylane","chocolate","bilk","cheese","rum","blood","charcoal","coffee","ectoplasm","space_drugs","milk","mutadone","antihol","teporone","insulin","salbutamol","toxin")
|
||||
reagents.add_reagent(random_reagent, 10)
|
||||
|
||||
/obj/item/clothing/mask/cigarette/joint
|
||||
name = "joint"
|
||||
desc = "A roll of ambrosium vulgaris wrapped in a thin paper. Dude."
|
||||
|
||||
@@ -20,6 +20,18 @@
|
||||
name = "black lipstick"
|
||||
colour = "black"
|
||||
|
||||
/obj/item/weapon/lipstick/green
|
||||
name = "green lipstick"
|
||||
colour = "green"
|
||||
|
||||
/obj/item/weapon/lipstick/blue
|
||||
name = "blue lipstick"
|
||||
colour = "blue"
|
||||
|
||||
/obj/item/weapon/lipstick/white
|
||||
name = "white lipstick"
|
||||
colour = "white"
|
||||
|
||||
/obj/item/weapon/lipstick/random
|
||||
name = "lipstick"
|
||||
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
/obj/item/weapon/scissors
|
||||
name = "Scissors"
|
||||
desc = "Those are scissors. Don't run with them!"
|
||||
icon_state = "scissor"
|
||||
item_state = "scissor"
|
||||
force = 5
|
||||
sharp = 1
|
||||
edge = 1
|
||||
w_class = 2
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
attack_verb = list("slices", "cuts", "stabs", "jabs")
|
||||
|
||||
/obj/item/weapon/scissors/barber
|
||||
name = "Barber's Scissors"
|
||||
desc = "A pair of scissors used by the barber."
|
||||
icon_state = "bscissor"
|
||||
item_state = "scissor"
|
||||
attack_verb = list("beautifully slices", "artistically cuts", "smoothly stabs", "quickly jabs")
|
||||
|
||||
/obj/item/weapon/scissors/attack(mob/living/carbon/M as mob, mob/user as mob)
|
||||
if(user.a_intent != "help")
|
||||
..()
|
||||
return
|
||||
if(!(M in view(1))) //Adjacency test
|
||||
..()
|
||||
return
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
//see code/modules/mob/new_player/preferences.dm at approx line 545 for comments!
|
||||
//this is largely copypasted from there.
|
||||
//handle facial hair (if necessary)
|
||||
var/list/species_facial_hair = list()
|
||||
if(H.gender == MALE || H.get_species() == "Vulpkanin")
|
||||
if(H.species)
|
||||
for(var/i in facial_hair_styles_list)
|
||||
var/datum/sprite_accessory/facial_hair/tmp_facial = facial_hair_styles_list[i]
|
||||
if(H.species.name in tmp_facial.species_allowed)
|
||||
species_facial_hair += i
|
||||
else
|
||||
species_facial_hair = facial_hair_styles_list
|
||||
var/f_new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in species_facial_hair
|
||||
//handle normal hair
|
||||
var/list/species_hair = list()
|
||||
if(H.species)
|
||||
for(var/i in hair_styles_list)
|
||||
var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
|
||||
if(H.species.name in tmp_hair.species_allowed)
|
||||
species_hair += i
|
||||
else
|
||||
species_hair = hair_styles_list
|
||||
var/h_new_style = input(user, "Select a hair style", "Grooming") as null|anything in species_hair
|
||||
user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>") //arguments for this are: 1. what others see 2. what the user sees. --Fixed grammar, (TGameCo)
|
||||
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
|
||||
spawn(5)
|
||||
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
|
||||
spawn(10)
|
||||
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
|
||||
if(do_after(user, 50, target = H)) //this is the part that adds a delay. delay is in deciseconds. --Made it 5 seconds, because hair isn't cut in one second in real life, and I want at least a little bit longer time, (TGameCo)
|
||||
if(!(M in view(1))) //Adjacency test
|
||||
user.visible_message("<span class='notice'>[user] stops cutting [M]'s hair.</span>", "<span class='notice'>You stop cutting [M]'s hair.</span>")
|
||||
return
|
||||
if(f_new_style)
|
||||
H.f_style = f_new_style
|
||||
if(h_new_style)
|
||||
H.h_style = h_new_style
|
||||
|
||||
H.update_hair()
|
||||
user.visible_message("<span class='notice'>[user] finishes cutting [M]'s hair!</span>")
|
||||
|
||||
/obj/item/weapon/scissors/safety //Totally safe, I assure you.
|
||||
name = "safety scissors"
|
||||
desc = "The blades of the scissors appear to be made of some sort of ultra-strong metal alloy."
|
||||
force = 18 //same as e-daggers
|
||||
var/is_cutting = 0 //to prevent spam clicking this for huge accumulation of losebreath.
|
||||
|
||||
/obj/item/weapon/scissors/safety/attack(mob/living/carbon/M as mob, mob/user as mob)
|
||||
if(user.a_intent != "help")
|
||||
..()
|
||||
return
|
||||
if(!(M in view(1)))
|
||||
..()
|
||||
return
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
|
||||
if(!is_cutting)
|
||||
is_cutting = 1
|
||||
user.visible_message("<span class='notice'>[user] starts cutting [M]'s hair!</span>", "<span class='notice'>You start cutting [M]'s hair!</span>")
|
||||
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
|
||||
spawn(5)
|
||||
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
|
||||
spawn(10)
|
||||
playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
|
||||
if(do_after(user, 50, target = H))
|
||||
playsound(loc, "sound/weapons/bladeslice.ogg", 50, 1, -1)
|
||||
user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices their throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice their throat!</span>")
|
||||
H.losebreath += 10 //30 Oxy damage over time
|
||||
H.apply_damage(18, BRUTE, "head", sharp =1, edge =1, used_weapon = "scissors")
|
||||
var/turf/location = get_turf(H)
|
||||
if (istype(location, /turf/simulated))
|
||||
location.add_blood(H)
|
||||
H.bloody_hands(H)
|
||||
H.bloody_body(H)
|
||||
var/mob/living/carbon/human/U = user
|
||||
U.bloody_hands(H)
|
||||
U.bloody_body(H)
|
||||
is_cutting = 0
|
||||
return
|
||||
is_cutting = 0
|
||||
@@ -644,3 +644,33 @@
|
||||
new /obj/item/weapon/light/tube(src)
|
||||
for(var/i = 0; i < 7; i++)
|
||||
new /obj/item/weapon/light/bulb(src)
|
||||
|
||||
/obj/item/weapon/storage/box/barber
|
||||
name = "Barber Starter Kit"
|
||||
desc = "For all hairstyling needs."
|
||||
icon_state = "implant"
|
||||
|
||||
/obj/item/weapon/storage/box/barber/New()
|
||||
..()
|
||||
new /obj/item/weapon/scissors/barber(src)
|
||||
new /obj/item/hair_dye_bottle(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/hairgrownium(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/hair_dye(src)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/reagent(src)
|
||||
new /obj/item/weapon/reagent_containers/dropper(src)
|
||||
new /obj/item/clothing/mask/fakemoustache(src) //totally necessary for successful barbering -Fox
|
||||
|
||||
/obj/item/weapon/storage/box/lip_stick
|
||||
name = "Lipstick Kit"
|
||||
desc = "For all your lip coloring needs."
|
||||
icon_state = "implant"
|
||||
|
||||
/obj/item/weapon/storage/box/lip_stick/New()
|
||||
..()
|
||||
new /obj/item/weapon/lipstick(src)
|
||||
new /obj/item/weapon/lipstick/purple(src)
|
||||
new /obj/item/weapon/lipstick/jade(src)
|
||||
new /obj/item/weapon/lipstick/black(src)
|
||||
new /obj/item/weapon/lipstick/green(src)
|
||||
new /obj/item/weapon/lipstick/blue(src)
|
||||
new /obj/item/weapon/lipstick/white(src)
|
||||
@@ -168,13 +168,14 @@
|
||||
icon_type = "cigarette"
|
||||
var/list/unlaced_cigarettes = list() // Cigarettes that haven't received reagents yet
|
||||
var/default_reagents = list("nicotine" = 15) // List of reagents to pre-generate for each cigarette
|
||||
var/cigarette_type = /obj/item/clothing/mask/cigarette
|
||||
|
||||
/obj/item/weapon/storage/fancy/cigarettes/New()
|
||||
..()
|
||||
flags |= NOREACT
|
||||
create_reagents(30 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
|
||||
for(var/i = 1 to storage_slots)
|
||||
var/obj/item/clothing/mask/cigarette/C = new /obj/item/clothing/mask/cigarette(src)
|
||||
var/obj/item/clothing/mask/cigarette/C = new cigarette_type(src)
|
||||
unlaced_cigarettes += C
|
||||
for(var/R in default_reagents)
|
||||
reagents.add_reagent(R, default_reagents[R])
|
||||
@@ -281,6 +282,13 @@
|
||||
"atrazine" = 1,
|
||||
"toxin" = 1.5)
|
||||
|
||||
/obj/item/weapon/storage/fancy/cigarettes/cigpack_random
|
||||
name ="\improper Embellished Enigma packet"
|
||||
desc = "For the true connoisseur of exotic flavors."
|
||||
icon_state = "shadyjimpacket"
|
||||
item_state = "cigpacket"
|
||||
cigarette_type = /obj/item/clothing/mask/cigarette/random
|
||||
|
||||
/*
|
||||
* Vial Box
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user