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

Bridge Gone; Science Department Resprite + Drip Expansion (#30917)

Browse Source 
* obj sprites, human suits, vox suits, berets, softcap, loadout, vendors

* compile fix

* kidan sprites

* drask sprites + kidan uniform i missed

* xenobio merge conflict + swap robotics beret names

* grey sprites

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
This commit is contained in:
Ahzpy
2025-11-13 23:37:20 +00:00
committed by GitHub
parent 0cc4014314
commit 0a615e798e
21 changed files with 218 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/beret.dm
+57 -3
View File
@@ -147,19 +147,73 @@
/obj/item/clothing/head/beret/sci
name = "science beret"
desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma."
desc = "A purple beret with a lavender science insignia emblazoned on it. It has that authentic smell of burning plasma."
icon_state = "beret_science"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
/obj/item/clothing/head/beret/sci_alt
name = "corporate science beret"
desc = "A white beret with a purple science insignia emblazoned on it. It has that authentic smell of burning plasma."
icon_state = "beret_science_alt"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
/obj/item/clothing/head/beret/robowhite
name = "robotics beret"
name = "bioengineer beret"
desc = "A white beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
icon_state = "beret_roboticswhite"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
/obj/item/clothing/head/beret/roboblack
name = "bioengineer beret"
name = "robotics beret"
desc = "A black beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
icon_state = "beret_roboticsblack"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
/obj/item/clothing/head/beret/gene
name = "genetics beret"
desc = "A purple beret with a wine colored science insignia emblazoned on it. It smells of mutagens."
icon_state = "beret_genetics"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
/obj/item/clothing/head/beret/gene_alt
name = "corporate genetics beret"
desc = "A white beret with a wine colored science insignia emblazoned on it. It smells of mutagens."
icon_state = "beret_genetics_alt"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
/obj/item/clothing/head/beret/gene_wine
name = "wine genetics beret"
desc = "A wine colored beret with a white science insignia emblazoned on it. It smells of mutagens."
icon_state = "beret_genetics_wine"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
//Service
/obj/item/clothing/head/beret/hop
name = "head of personnel's beret"
code/modules/clothing/head/soft_caps.dm
+5
View File
@@ -144,6 +144,11 @@
icon_state = "paramedic"
dog_fashion = /datum/dog_fashion/head/paramedic
/obj/item/clothing/head/soft/robotics
name = "robotics cap"
desc = "It's a black baseball hat with a red research shield."
icon_state = "robo"
/obj/item/clothing/head/soft/sec
name = "security cap"
desc = "It's baseball hat in tasteful red colour."
code/modules/clothing/under/jobs/rnd.dm
+49 -7
View File
@@ -39,34 +39,76 @@
/obj/item/clothing/under/rank/rnd/scientist
name = "scientist's jumpsuit"
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
desc = "A breathable purple jumpsuit with light markings, designating the wearer a scientist."
icon_state = "science"
permeability_coefficient = 0.50
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/clothing/under/rank/rnd/scientist/skirt
name = "scientist's jumpskirt"
icon_state = "sciencewhitef"
desc = "A breathable purple jumpskirt with light markings, designating the wearer a scientist."
icon_state = "science_skirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/rnd/scientist/corporate
name = "scientist's corporate uniform"
desc = "A sterile white uniform with purple markings, for the mad scientist who favors style."
icon_state = "sci_corporate"
/obj/item/clothing/under/rank/rnd/scientist/skirt/corporate
name = "scientist's corporate skirt"
desc = "A sterile white skirt with purple markings, for the mad scientist who favors style."
icon_state = "sci_corp_skirt"
/obj/item/clothing/under/rank/rnd/roboticist
name = "roboticist's jumpsuit"
desc = "It's a slimming black with reinforced seams; great for industrial work."
desc = "A slimming black jumpsuit with reinforced seams; great for industrial work."
icon_state = "robotics"
resistance_flags = NONE
/obj/item/clothing/under/rank/rnd/roboticist/skirt
name = "roboticist's jumpskirt"
desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
icon_state = "roboticsf"
desc = "A slimming black jumpskirt with reinforced seams; a great look for industrial work."
icon_state = "robotics_skirt"
/obj/item/clothing/under/rank/rnd/roboticist/corporate
name = "bioengineer's jumpsuit"
desc = "A sterile white jumpsuit with reinforced seams; a great look for surgical work."
icon_state = "bioengineer"
/obj/item/clothing/under/rank/rnd/roboticist/skirt/corporate
name = "bioengineer's jumpskirt"
desc = "A sterile white jumpskirt with reinforced seams; a great look for surgical work."
icon_state = "bioengineer_skirt"
/obj/item/clothing/under/rank/rnd/roboticist/corporate/alt
name = "roboticist's coveralls"
desc = "A mechanic's red coveralls with black markings and chest pockets, for those who aren't afraid to get covered in oil and blood."
icon_state = "robo_corporate"
/obj/item/clothing/under/rank/rnd/roboticist/overalls
name = "roboticist's overalls"
desc = "A red set of overalls over a black turtleneck, for those who aren't afraid to get covered in oil and blood."
icon_state = "robo_overalls"
/obj/item/clothing/under/rank/rnd/geneticist
name = "geneticist's jumpsuit"
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
desc = "A tear-proof purple jumpsuit with wine colored markings, designating the wearer a geneticist."
icon_state = "genetics"
permeability_coefficient = 0.50
/obj/item/clothing/under/rank/rnd/geneticist/skirt
name = "geneticist's jumpskirt"
icon_state = "geneticswhitef"
desc = "A tear-proof purple jumpskirt with wine colored markings, designating the wearer a geneticist."
icon_state = "genetics_skirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/rnd/geneticist/corporate
name = "geneticist's corporate uniform"
desc = "A tear-proof sterile white uniform with wine colored markings, for those who prefer a clean look while scrambling their genetic code."
icon_state = "gen_corporate"
/obj/item/clothing/under/rank/rnd/geneticist/skirt/corporate
name = "geneticist's corporate skirt"
desc = "A tear-proof sterile white skirt with wine colored markings, for those who prefer a clean look while scrambling their genetic code."
icon_state = "gen_corp_skirt"