mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-13 08:04:22 +01:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
# Conflicts: # code/modules/economy/lorenews.dm # code/modules/mob/living/simple_animal/animals/cat.dm # html/changelogs/.all_changelog.yml # maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
Leshana
@@ -46,11 +46,11 @@
|
||||
if(colour != "#FFFFFF" && shadeColour != "#000000")
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
to_chat(usr,"You will now draw in white and black with this crayon.")
|
||||
to_chat(user, "You will now draw in white and black with this crayon.")
|
||||
else
|
||||
colour = "#000000"
|
||||
shadeColour = "#FFFFFF"
|
||||
to_chat(usr,"You will now draw in black and white with this crayon.")
|
||||
to_chat(user, "You will now draw in black and white with this crayon.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/rainbow
|
||||
@@ -72,22 +72,22 @@
|
||||
switch(drawtype)
|
||||
if("letter")
|
||||
drawtype = input("Choose the letter.", "Crayon scribbles") in list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
|
||||
to_chat(usr,"You start drawing a letter on the [target.name].")
|
||||
to_chat(user, "You start drawing a letter on the [target.name].")
|
||||
if("graffiti")
|
||||
to_chat(usr,"You start drawing graffiti on the [target.name].")
|
||||
to_chat(user, "You start drawing graffiti on the [target.name].")
|
||||
if("rune")
|
||||
to_chat(usr,"You start drawing a rune on the [target.name].")
|
||||
to_chat(user, "You start drawing a rune on the [target.name].")
|
||||
if("arrow")
|
||||
drawtype = input("Choose the arrow.", "Crayon scribbles") in list("left", "right", "up", "down")
|
||||
to_chat(usr,"You start drawing an arrow on the [target.name].")
|
||||
to_chat(user, "You start drawing an arrow on the [target.name].")
|
||||
if(instant || do_after(user, 50))
|
||||
new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
|
||||
to_chat(usr,"You finish drawing.")
|
||||
to_chat(user, "You finish drawing.")
|
||||
target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on.
|
||||
if(uses)
|
||||
uses--
|
||||
if(!uses)
|
||||
to_chat(usr,"<span class='warning'>You used up your crayon!</span>")
|
||||
to_chat(user, "<span class='warning'>You used up your crayon!</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
@@ -158,11 +158,11 @@
|
||||
if(colour != "#FFFFFF" && shadeColour != "#000000")
|
||||
colour = "#FFFFFF"
|
||||
shadeColour = "#000000"
|
||||
to_chat(usr,"You will now draw in white and black with this marker.")
|
||||
to_chat(user, "You will now draw in white and black with this marker.")
|
||||
else
|
||||
colour = "#000000"
|
||||
shadeColour = "#FFFFFF"
|
||||
to_chat(usr,"You will now draw in black and white with this marker.")
|
||||
to_chat(user, "You will now draw in black and white with this marker.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/rainbow
|
||||
@@ -179,7 +179,7 @@
|
||||
|
||||
/obj/item/weapon/pen/crayon/marker/attack(mob/M as mob, mob/user as mob)
|
||||
if(M == user)
|
||||
to_chat(usr,"You take a bite of the marker and swallow it.")
|
||||
to_chat(user, "You take a bite of the marker and swallow it.")
|
||||
user.nutrition += 1
|
||||
user.reagents.add_reagent("marker_ink",6)
|
||||
if(uses)
|
||||
|
||||
@@ -111,6 +111,7 @@
|
||||
user.visible_message("<span class='notice'>\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>", \
|
||||
"<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" )
|
||||
W.bandage()
|
||||
W.disinfect()
|
||||
used++
|
||||
affecting.update_damages()
|
||||
if(used == amount)
|
||||
|
||||
@@ -138,18 +138,18 @@
|
||||
|
||||
/obj/item/weapon/storage/backpack/dufflebag/syndie
|
||||
name = "black dufflebag"
|
||||
desc = "A large dufflebag for holding extra tactical supplies."
|
||||
desc = "A large dufflebag for holding extra tactical supplies. This one appears to be made out of lighter material than usual."
|
||||
icon_state = "duffle_syndie"
|
||||
slowdown = 0
|
||||
|
||||
/obj/item/weapon/storage/backpack/dufflebag/syndie/med
|
||||
name = "medical dufflebag"
|
||||
desc = "A large dufflebag for holding extra tactical medical supplies."
|
||||
desc = "A large dufflebag for holding extra tactical medical supplies. This one appears to be made out of lighter material than usual."
|
||||
icon_state = "duffle_syndiemed"
|
||||
|
||||
/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo
|
||||
name = "ammunition dufflebag"
|
||||
desc = "A large dufflebag for holding extra weapons ammunition and supplies."
|
||||
desc = "A large dufflebag for holding extra weapons ammunition and supplies. This one appears to be made out of lighter material than usual."
|
||||
icon_state = "duffle_syndieammo"
|
||||
|
||||
/obj/item/weapon/storage/backpack/dufflebag/captain
|
||||
@@ -417,4 +417,4 @@
|
||||
else
|
||||
H.visible_message("<span class='notice'>\The [src] decides not to unpack \the [src]!</span>", \
|
||||
"<span class='notice'>You decide not to unpack \the [src]!</span>")
|
||||
return
|
||||
return
|
||||
|
||||
@@ -107,10 +107,10 @@
|
||||
if(istype(W,/obj/item/weapon/pen/crayon))
|
||||
switch(W:colourName)
|
||||
if("mime")
|
||||
to_chat(usr,"This crayon is too sad to be contained in this box.")
|
||||
to_chat(user, "This crayon is too sad to be contained in this box.")
|
||||
return
|
||||
if("rainbow")
|
||||
to_chat(usr,"This crayon is too powerful to be contained in this box.")
|
||||
to_chat(user, "This crayon is too powerful to be contained in this box.")
|
||||
return
|
||||
..()
|
||||
|
||||
@@ -149,10 +149,10 @@
|
||||
if(istype(W,/obj/item/weapon/pen/crayon/marker))
|
||||
switch(W:colourName)
|
||||
if("mime")
|
||||
to_chat(usr,"This marker is too depressing to be contained in this box.")
|
||||
to_chat(user, "This marker is too depressing to be contained in this box.")
|
||||
return
|
||||
if("rainbow")
|
||||
to_chat(usr,"This marker is too childish to be contained in this box.")
|
||||
to_chat(user, "This marker is too childish to be contained in this box.")
|
||||
return
|
||||
..()
|
||||
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
/obj/item/weapon/card,
|
||||
/obj/item/clothing/mask/smokable/cigarette/,
|
||||
/obj/item/device/flashlight/pen,
|
||||
/obj/item/device/tape,
|
||||
/obj/item/weapon/cartridge,
|
||||
/obj/item/device/encryptionkey,
|
||||
/obj/item/seeds,
|
||||
/obj/item/stack/medical,
|
||||
/obj/item/weapon/coin,
|
||||
@@ -18,13 +21,21 @@
|
||||
/obj/item/weapon/implanter,
|
||||
/obj/item/weapon/flame/lighter,
|
||||
/obj/item/weapon/flame/match,
|
||||
/obj/item/weapon/forensics,
|
||||
/obj/item/weapon/glass_extra,
|
||||
/obj/item/weapon/haircomb,
|
||||
/obj/item/weapon/hand,
|
||||
/obj/item/weapon/key,
|
||||
/obj/item/weapon/lipstick,
|
||||
/obj/item/weapon/paper,
|
||||
/obj/item/weapon/pen,
|
||||
/obj/item/weapon/photo,
|
||||
/obj/item/weapon/reagent_containers/dropper,
|
||||
/obj/item/weapon/sample,
|
||||
/obj/item/weapon/screwdriver,
|
||||
/obj/item/weapon/stamp,
|
||||
/obj/item/clothing/accessory/permit
|
||||
/obj/item/clothing/accessory/permit,
|
||||
/obj/item/clothing/accessory/badge
|
||||
)
|
||||
slot_flags = SLOT_ID
|
||||
|
||||
|
||||
Reference in New Issue
Block a user