Allows you to wear the caution sign + new sprite for the caution sign (#44289)

* +Sprite +Repath

* Adds 5 brute armor
This commit is contained in:
Nalzul
2019-06-04 11:48:47 -04:00
committed by moo
parent c3f95024b2
commit 47700b8679
11 changed files with 26 additions and 11 deletions
+1 -1
View File
@@ -2283,7 +2283,7 @@
},
/area/awaymission/BMPship/Midship)
"hh" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"hi" = (
+1 -1
View File
@@ -2706,7 +2706,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
+1 -1
View File
@@ -107,7 +107,7 @@
if("Mime")
heirloom_type = /obj/item/reagent_containers/food/snacks/baguette
if("Janitor")
heirloom_type = pick(/obj/item/mop, /obj/item/caution, /obj/item/reagent_containers/glass/bucket)
heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket)
if("Cook")
heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/chefhat)
if("Botanist")
@@ -572,7 +572,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
/obj/item/stack/sheet/plastic
name = "plastic"
@@ -60,7 +60,7 @@
new /obj/item/melee/flyswatter(src)
new /obj/item/flashlight(src)
for(var/i in 1 to 3)
new /obj/item/caution(src)
new /obj/item/clothing/suit/caution(src)
new /obj/item/holosign_creator/janibarrier(src)
new /obj/item/lightreplacer(src)
new /obj/item/soap(src)
+2 -2
View File
@@ -70,7 +70,7 @@
l.janicart_insert(user,src)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/caution))
else if(istype(I, /obj/item/clothing/suit/caution))
if(signs < max_signs)
put_in_cart(I, user)
signs++
@@ -137,7 +137,7 @@
myreplacer = null
if(href_list["sign"])
if(signs)
var/obj/item/caution/Sign = locate() in src
var/obj/item/clothing/suit/caution/Sign = locate() in src
if(Sign)
user.put_in_hands(Sign)
to_chat(user, "<span class='notice'>You take \a [Sign] from [src].</span>")
+3 -3
View File
@@ -1475,9 +1475,9 @@
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/obj/item/caution,
/obj/item/caution,
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/item/storage/bag/trash,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/glass/rag,
@@ -481,6 +481,21 @@
icon_state = "pharoah"
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/caution
name = "wet floor sign"
desc = "Caution! Wet Floor!"
icon_state = "caution"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
force = 1
throwforce = 3
throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN
attack_verb = list("warned", "cautioned", "smashed")
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
// WINTER COATS
+1 -1
View File
@@ -265,7 +265,7 @@
/obj/item/paint/paint_remover = 1,
/obj/item/melee/flyswatter = 1,
/obj/item/flashlight = 1,
/obj/item/caution = 6,
/obj/item/clothing/suit/caution = 6,
/obj/item/holosign_creator/janibarrier = 1,
/obj/item/lightreplacer = 1,
/obj/item/soap/nanotrasen = 1,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 KiB

After

Width:  |  Height:  |  Size: 338 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 121 KiB