Keeping up to date.

This commit is contained in:
KasparoVy
2016-07-21 11:57:15 -04:00
375 changed files with 5239 additions and 5218 deletions
+94 -56
View File
@@ -10,6 +10,9 @@
////////// Usable Items //////////
//////////////////////////////////
/obj/item/device/fluff
var/used = 0
/obj/item/device/fluff/tattoo_gun // Generic tattoo gun, make subtypes for different folks
name = "dispoable tattoo pen"
desc = "A cheap plastic tattoo application pen."
@@ -18,7 +21,6 @@
force = 0
throwforce = 0
w_class = 1
var/used = 0
var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
var/tattoo_icon = "Tiger Body" // body_accessory.dmi, new icons defined in sprite_accessories.dm
var/tattoo_r = 1 // RGB values for the body markings
@@ -87,8 +89,28 @@
..()
update_icon()
/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat
desc = "A cheap plastic tattoo application pen.<br>This one seems heavily used."
tattoo_name = "circuitry tattoo"
tattoo_icon = "Elliot Circuit Tattoo"
tattoo_r = 48
tattoo_g = 138
tattoo_b = 176
/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat/attack_self(mob/user as mob)
if(!used)
var/ink_color = input("Please select an ink color.", "Tattoo Ink Color", rgb(tattoo_r, tattoo_g, tattoo_b)) as color|null
if(ink_color && !(user.incapacitated() || used) )
tattoo_r = hex2num(copytext(ink_color, 2, 4))
tattoo_g = hex2num(copytext(ink_color, 4, 6))
tattoo_b = hex2num(copytext(ink_color, 6, 8))
to_chat(user, "<span class='notice'>You change the color setting on the [src].</span>")
update_icon()
else
to_chat(user, "<span class='notice'>The [src] is out of ink!</span>")
/obj/item/weapon/claymore/fluff // MrBarrelrolll: Maximus Greenwood
name = "Greenwood's Blade"
@@ -200,6 +222,58 @@
to_chat(target, "<span class='notice'>You comb your tail with the [src].</span>")
used = 1
#define USED_MOD_HELM 1
#define USED_MOD_SUIT 2
/obj/item/device/fluff/shadey_plasman_modkit
name = "plasmaman suit modkit"
desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments."
icon_state = "modkit"
w_class = 2
force = 0
throwforce = 0
/obj/item/device/fluff/shadey_plasman_modkit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.lying)
return
var/mob/living/carbon/human/H = user
if(istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman))
if(used & USED_MOD_HELM)
to_chat(H, "<span class='notice'>The kit's helmet modifier has already been used.</span>")
return
to_chat(H, "<span class='notice'>You modify the appearance of [target].</span>")
used |= USED_MOD_HELM
var/obj/item/clothing/head/helmet/space/eva/plasmaman/P = target
P.name = "plasma containment helmet"
P.desc = "A purpose-built containment helmet designed to keep plasma in, and everything else out."
P.icon_state = "plasmaman_halo_helmet[P.on]"
P.base_state = "plasmaman_halo_helmet"
if(P == H.head)
H.update_inv_head()
return
if(istype(target, /obj/item/clothing/suit/space/eva/plasmaman))
if(used & USED_MOD_SUIT)
to_chat(user, "<span class='notice'>The kit's suit modifier has already been used.</span>")
return
to_chat(H, "<span class='notice'>You modify the appearance of [target].</span>")
used |= USED_MOD_SUIT
var/obj/item/clothing/suit/space/eva/plasmaman/P = target
P.name = "plasma containment suit"
P.desc = "A feminine containment suit designed to keep plasma in, and everything else out. It's even got an overskirt."
P.icon_state = "plasmaman_halo"
if(P == H.wear_suit)
H.update_inv_wear_suit()
return
to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
#undef USED_MOD_HELM
#undef USED_MOD_SUIT
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
@@ -251,7 +325,7 @@
icon_state = "kidosvest"
item_state = "kidosvest"
ignore_suitadjust = 1
action_button_name = null
actions_types = list()
adjust_flavour = null
species_fit = null
sprite_sheets = null
@@ -366,7 +440,7 @@
icon_state = "fox_jacket"
item_state = "fox_jacket"
ignore_suitadjust = 1
action_button_name = null
actions_types = list()
adjust_flavour = null
species_fit = null
sprite_sheets = null
@@ -418,28 +492,27 @@
icon_state = "chronx_hood"
item_state = "chronx_hood"
flags = HEADCOVERSEYES | BLOCKHAIR
action_button_name = "Transform Hood"
actions_types = list(/datum/action/item_action/toggle)
var/adjusted = 0
/obj/item/clothing/head/fluff/chronx/ui_action_click()
adjust()
/obj/item/clothing/head/fluff/chronx/verb/adjust()
set name = "Transform Hood"
set category = "Object"
set src in usr
if(isliving(usr) && !usr.incapacitated())
if(adjusted)
icon_state = initial(icon_state)
item_state = initial(item_state)
to_chat(usr, "You untransform \the [src].")
adjusted = 0
else
icon_state += "_open"
item_state += "_open"
to_chat(usr, "You transform \the [src].")
adjusted = 1
usr.update_inv_head()
/obj/item/clothing/head/fluff/chronx/proc/adjust()
if(adjusted)
icon_state = initial(icon_state)
item_state = initial(item_state)
to_chat(usr, "You untransform \the [src].")
adjusted = 0
else
icon_state += "_open"
item_state += "_open"
to_chat(usr, "You transform \the [src].")
adjusted = 1
usr.update_inv_head()
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtonIcon()
/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx //chronx100: Hughe O'Splash
name = "Cthulhu's Robes"
@@ -448,22 +521,10 @@
icon_state = "chronx_robe"
item_state = "chronx_robe"
flags_size = ONESIZEFITSALL
action_button_name = "Transform Robes"
actions_types = list(/datum/action/item_action/toggle)
adjust_flavour = "untransform"
ignore_suitadjust = 0
/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx/New()
..()
verbs -= /obj/item/clothing/suit/verb/openjacket
/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx/verb/adjust()
set name = "Transform Robes"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living))
return
adjustsuit(usr)
/obj/item/clothing/shoes/black/fluff/chronx //chronx100: Hughe O'Splash
name = "Cthulhu's Boots"
desc = "Boots worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
@@ -496,26 +557,3 @@
suit_adjusted = 1
species_fit = null
sprite_sheets = null
/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat
desc = "A cheap plastic tattoo application pen.<br>This one seems heavily used."
tattoo_name = "circuitry tattoo"
tattoo_icon = "Elliot Circuit Tattoo"
tattoo_r = 48
tattoo_g = 138
tattoo_b = 176
/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat/attack_self(mob/user as mob)
if(!used)
var/ink_color = input("Please select an ink color.", "Tattoo Ink Color", rgb(tattoo_r, tattoo_g, tattoo_b)) as color|null
if(ink_color && !(user.incapacitated() || used) )
tattoo_r = hex2num(copytext(ink_color, 2, 4))
tattoo_g = hex2num(copytext(ink_color, 4, 6))
tattoo_b = hex2num(copytext(ink_color, 6, 8))
to_chat(user, "<span class='notice'>You change the color setting on the [src].</span>")
update_icon()
else
to_chat(user, "<span class='notice'>The [src] is out of ink!</span>")