cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clothing grammar tweaks and the such (#15761)

Browse Source 
* Clothing grammar and the such

* Made the PR more \improper and other stuff

* Suggested stuff

* Removed 's where it made sense

There are more most likely
This commit is contained in:
E-MonaRhg
2021-03-30 12:27:55 +01:00
committed by GitHub
parent 275d10ca7c
commit 6d06dc97a4
35 changed files with 219 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
+5 -5
View File
@@ -1,6 +1,6 @@
/obj/item/clothing/gloves/color/yellow
desc = "These gloves will protect the wearer from electric shock."
name = "insulated gloves"
desc = "These gloves will protect the wearer from electric shock."
icon_state = "yellow"
item_state = "ygloves"
siemens_coefficient = 0
@@ -52,8 +52,8 @@
siemens_coefficient = 1
/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
name = "budget insulated gloves"
desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
icon_state = "yellow"
item_state = "ygloves"
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
@@ -66,16 +66,16 @@
siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
/obj/item/clothing/gloves/color/fyellow/old
desc = "Old and worn out insulated gloves, hopefully they still work."
name = "worn out insulated gloves"
desc = "Old and worn out insulated gloves, hopefully they still work."
/obj/item/clothing/gloves/color/fyellow/old/New()
..()
siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75)
/obj/item/clothing/gloves/color/black
desc = "These gloves are fire-resistant."
name = "black gloves"
desc = "These gloves are fire-resistant."
icon_state = "black"
item_state = "bgloves"
item_color="brown"
@@ -226,8 +226,8 @@
/obj/item/clothing/gloves/color/captain
desc = "Regal blue gloves, with a nice gold trim. Swanky."
name = "captain's gloves"
desc = "Regal blue gloves, with a nice gold trim. Swanky."
icon_state = "captain"
item_state = "egloves"
item_color = "captain"
code/modules/clothing/gloves/miscellaneous.dm
+7 -7
View File
@@ -12,8 +12,8 @@
clipped = 1
/obj/item/clothing/gloves/cyborg
desc = "beep boop borp"
name = "cyborg gloves"
desc = "beep boop borp"
icon_state = "black"
item_state = "r_hands"
@@ -25,8 +25,8 @@
can_leave_fibers = FALSE
/obj/item/clothing/gloves/combat
desc = "These tactical gloves are both insulated and offer protection from heat sources."
name = "combat gloves"
desc = "These tactical gloves are both insulated and offer protection from heat sources."
icon_state = "combat"
item_state = "swat_gl"
siemens_coefficient = 0
@@ -55,8 +55,8 @@
armor = list("melee" = 15, "bullet" = 25, "laser" = 15, "energy" = 15, "bomb" = 20, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/gloves/botanic_leather
desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "botanist's leather gloves"
desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
icon_state = "leather"
item_state = "ggloves"
permeability_coefficient = 0.9
@@ -68,8 +68,8 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30)
/obj/item/clothing/gloves/batmangloves
desc = "Used for handling all things bat related."
name = "batgloves"
desc = "Used for handling all things bat related."
icon_state = "bmgloves"
item_state = "bmgloves"
item_color="bmgloves"
@@ -157,7 +157,7 @@
update_icon()
/obj/item/clothing/gloves/fingerless/rapid
name = "Gloves of the North Star"
name = "gloves of the North Star"
desc = "Just looking at these fills you with an urge to beat the shit out of people."
var/accepted_intents = list(INTENT_HARM)
var/click_speed_modifier = CLICK_CD_RAPID
@@ -173,13 +173,13 @@
.= FALSE
/obj/item/clothing/gloves/fingerless/rapid/admin
name = "Advanced Interactive Gloves"
name = "advanced interactive gloves"
desc = "The gloves are covered in indecipherable buttons and dials, your mind warps by merely looking at them."
accepted_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
click_speed_modifier = 0
siemens_coefficient = 0
/obj/item/clothing/gloves/fingerless/rapid/headpat
name = "Gloves of Headpats"
name = "gloves of headpats"
desc = "You feel the irresistable urge to give headpats by merely glimpsing these."
accepted_intents = list(INTENT_HELP)