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

Merge remote-tracking branch 'ParadiseSS13/master' into skills_rework

Browse Source
This commit is contained in:
Kyep
2020-09-19 06:39:38 -07:00
parent 995165ae38 ce2f0d401d
commit be024bbbcc
534 changed files with 9837 additions and 16102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+6
View File
@@ -120,6 +120,12 @@
else
icon = initial(icon)
/**
* Used for any clothing interactions when the user is on fire. (e.g. Cigarettes getting lit.)
*/
/obj/item/clothing/proc/catch_fire() //Called in handle_fire()
return
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
code/modules/clothing/head/helmet.dm
+3 -3
View File
@@ -193,7 +193,7 @@
toggle_sound = 'sound/items/zippoclose.ogg'
dog_fashion = null
obj/item/clothing/head/helmet/redtaghelm
/obj/item/clothing/head/helmet/redtaghelm
name = "red laser tag helmet"
desc = "They have chosen their own end."
icon_state = "redtaghelm"
@@ -204,7 +204,7 @@ obj/item/clothing/head/helmet/redtaghelm
flags_inv = HIDEEARS|HIDEEYES
dog_fashion = null
obj/item/clothing/head/helmet/bluetaghelm
/obj/item/clothing/head/helmet/bluetaghelm
name = "blue laser tag helmet"
desc = "They'll need more men."
icon_state = "bluetaghelm"
@@ -215,7 +215,7 @@ obj/item/clothing/head/helmet/bluetaghelm
flags_inv = HIDEEARS|HIDEEYES
dog_fashion = null
obj/item/clothing/head/blob
/obj/item/clothing/head/blob
name = "blob hat"
desc = "A collectible hat handed out at the latest Blob Family Reunion."
icon_state = "blobhat"
code/modules/clothing/head/misc.dm
+1
View File
@@ -401,6 +401,7 @@
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
resistance_flags = NONE
dog_fashion = /datum/dog_fashion/head/cone
/obj/item/clothing/head/jester
name = "jester hat"
code/modules/clothing/shoes/colour.dm
+19 -14
View File
@@ -9,8 +9,8 @@
heat_protection = FEET
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
redcoat
item_color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way.
/obj/item/clothing/shoes/black/redcoat
item_color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way.
/obj/item/clothing/shoes/black/greytide
flags = NODROP
@@ -20,18 +20,23 @@
desc = "A pair of brown shoes."
icon_state = "brown"
captain
item_color = "captain" //Exists for washing machines. Is not different from brown shoes in any way.
hop
item_color = "hop" //Exists for washing machines. Is not different from brown shoes in any way.
ce
item_color = "chief" //Exists for washing machines. Is not different from brown shoes in any way.
rd
item_color = "director" //Exists for washing machines. Is not different from brown shoes in any way.
cmo
item_color = "medical" //Exists for washing machines. Is not different from brown shoes in any way.
cmo
item_color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/brown/captain
item_color = "captain" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/brown/hop
item_color = "hop" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/brown/ce
item_color = "chief" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/brown/rd
item_color = "director" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/brown/cmo
item_color = "medical" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/brown/qm
item_color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/blue
name = "blue shoes"
code/modules/clothing/shoes/magboots.dm
+10 -1
View File
@@ -8,11 +8,19 @@
var/slowdown_active = 2
var/slowdown_passive = SHOES_SLOWDOWN
var/magpulse_name = "mag-pulse traction system"
var/gustprotection = FALSE //this is for unsafe_unwrenching protection
actions_types = list(/datum/action/item_action/toggle)
strip_delay = 70
put_on_delay = 70
resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/magboots/atmos
desc = "Magnetic boots, made to withstand gusts of space wind over 500kmph."
name = "atmospheric magboots"
icon_state = "atmosmagboots0"
magboot_state = "atmosmagboots"
gustprotection = TRUE
/obj/item/clothing/shoes/magboots/attack_self(mob/user)
if(magpulse)
flags &= ~NOSLIP
@@ -42,6 +50,7 @@
name = "advanced magboots"
icon_state = "advmag0"
magboot_state = "advmag"
gustprotection = TRUE
slowdown_active = SHOES_SLOWDOWN
origin_tech = null
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -53,7 +62,7 @@
magboot_state = "syndiemag"
origin_tech = "magnets=4;syndicate=2"
obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team
/obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team
desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders."
name = "advanced blood-red magboots"
slowdown_active = SHOES_SLOWDOWN
code/modules/clothing/shoes/miscellaneous.dm
+7
View File
@@ -344,3 +344,10 @@
recharging_time = world.time + recharging_rate
else
to_chat(user, "<span class='warning'>Something prevents you from dashing forward!</span>")
/obj/item/clothing/shoes/ducky
name = "rubber ducky shoes"
desc = "These shoes are made for quacking, and thats just what they'll do."
icon_state = "ducky"
item_state = "ducky"
shoe_sound = "sound/items/squeaktoy.ogg"
code/modules/clothing/spacesuits/ert.dm
+16 -5
View File
@@ -16,15 +16,26 @@
"Vox" = 'icons/mob/species/vox/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize()
var/mob/living/carbon/human/wearer = loc.loc //loc is the hardsuit, so its loc is the wearer
if(ishuman(wearer))
register_camera(wearer)
..()
/obj/item/clothing/head/helmet/space/hardsuit/ert/attack_self(mob/user)
if(camera || !has_camera)
..(user)
else
camera = new /obj/machinery/camera(src)
camera.network = list("ERT")
GLOB.cameranet.removeCamera(camera)
camera.c_tag = user.name
to_chat(user, "<span class='notice'>User scanned as [camera.c_tag]. Camera activated.</span>")
register_camera(user)
/obj/item/clothing/head/helmet/space/hardsuit/ert/proc/register_camera(mob/wearer)
if(camera || !has_camera)
return
camera = new /obj/machinery/camera(src)
camera.network = list("ERT")
GLOB.cameranet.removeCamera(camera)
camera.c_tag = wearer.name
to_chat(wearer, "<span class='notice'>User scanned as [camera.c_tag]. Camera activated.</span>")
/obj/item/clothing/head/helmet/space/hardsuit/ert/examine(mob/user)
. = ..()
code/modules/clothing/spacesuits/syndi.dm
+4 -4
View File
@@ -83,7 +83,7 @@
icon_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"
obj/item/clothing/head/helmet/space/syndicate/black/strike
/obj/item/clothing/head/helmet/space/syndicate/black/strike
name = "Syndicate Strike Team commando helmet"
desc = "A heavily armored black helmet that is only given to high-ranking Syndicate operatives."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
@@ -95,7 +95,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/strike
icon_state = "syndicate-black"
item_state = "syndicate-black"
obj/item/clothing/suit/space/syndicate/black/strike
/obj/item/clothing/suit/space/syndicate/black/strike
name = "Syndicate Strike Team commando space suit"
desc = "A heavily armored, black space suit that is only given to high-ranking Syndicate operatives."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
@@ -156,7 +156,7 @@ obj/item/clothing/suit/space/syndicate/black/strike
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
obj/item/clothing/head/helmet/space/syndicate/black/red/strike
/obj/item/clothing/head/helmet/space/syndicate/black/red/strike
name = "Syndicate Strike Team leader helmet"
desc = "A heavily armored, black and red space helmet that is only given to elite Syndicate operatives, it looks particularly menacing."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
@@ -168,7 +168,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/red/strike
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
obj/item/clothing/suit/space/syndicate/black/red/strike
/obj/item/clothing/suit/space/syndicate/black/red/strike
name = "Syndicate Strike Team leader space suit"
desc = "A heavily armored, black and red space suit that is only given to elite Syndicate operatives, it looks particularly menacing."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
code/modules/clothing/under/color.dm
+4
View File
@@ -128,6 +128,10 @@
item_state = "p_suit"
item_color = "purple"
/obj/item/clothing/under/color/purple/sensor //for jani ert
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/color/lightpurple
name = "light purple jumpsuit"
icon_state = "lightpurple"
code/modules/clothing/under/jobs/civilian.dm
+4
View File
@@ -48,6 +48,10 @@
item_state = "bl_suit"
item_color = "chapblack"
/obj/item/clothing/under/rank/chaplain/sensor
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/chef
desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
name = "chef's uniform"
code/modules/clothing/under/jobs/engineering.dm
+4
View File
@@ -39,6 +39,10 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20)
resistance_flags = NONE
/obj/item/clothing/under/rank/engineer/sensor
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/engineer/skirt
desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
code/modules/clothing/under/jobs/medsci.dm
+4
View File
@@ -124,6 +124,10 @@
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/under/rank/medical/sensor
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/medical/skirt
name = "medical doctor's jumpskirt"
icon_state = "medicalf"
code/modules/clothing/under/jobs/security.dm
+4
View File
@@ -34,6 +34,10 @@
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
/obj/item/clothing/under/rank/security/sensor
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/security/skirt
name = "security officer's jumpskirt"
desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
code/modules/clothing/under/miscellaneous.dm
+4
View File
@@ -88,6 +88,10 @@
item_state = "g_suit"
item_color = "officer"
/obj/item/clothing/under/rank/centcom_officer/sensor
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/rank/centcom_commander
desc = "It's a jumpsuit worn by CentComm's highest-tier Commanders."
name = "\improper CentComm officer's jumpsuit"