cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[READY] Moves Genetics to the Science department and makes Gen… (#48397)

Browse Source 
* great googly moogly it's all gone to shit

* Fixed geneticist ID, moved in job list

* This is what I get for not building

* Fixed HUD sprite

* Finalized move to R&D code areas and updated sprites

* Mapping fixes on Meta

* Boxstation's turn and some Meta fixes

* Fixing map conflicts

* Moves genetics to science

SQUASHED:

great googly moogly it's all gone to shit

Fixed geneticist ID, moved in job list

This is what I get for not building

Fixed HUD sprite

Finalized move to R&D code areas and updated sprites

Mapping fixes on Meta

Boxstation's turn and some Meta fixes

Fixing map conflicts

* lmao travis

* okay you can pass travis this time

* DeltaStation changes

* lmao access bullshit

* Kilo also a few code/sprite fixes

* Pubbystation

* Removed gondolas because people hate fun
This commit is contained in:
TheVekter
2020-01-02 06:15:35 -08:00
committed by Rob Bailey
parent 7ac5690cb9
commit da2b817e44
33 changed files with 3028 additions and 5558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/research.dmm
+4 -4
View File
@@ -2891,7 +2891,7 @@
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist
uniform = /obj/item/clothing/under/rank/rnd/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/purple{
@@ -3870,7 +3870,7 @@
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist
uniform = /obj/item/clothing/under/rank/rnd/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/purple{
@@ -4709,7 +4709,7 @@
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist
uniform = /obj/item/clothing/under/rank/rnd/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/blue{
@@ -5585,7 +5585,7 @@
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist
uniform = /obj/item/clothing/under/rank/rnd/geneticist
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/research/exterior)
_maps/map_files/BoxStation/BoxStation.dmm
+599 -457
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+436 -771
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/KiloStation/KiloStation.dmm
+790 -2762
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+595 -1190
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+559 -332
View File
File diff suppressed because it is too large Load Diff
code/__DEFINES/jobs.dm
+8 -8
View File
@@ -79,12 +79,12 @@
#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22
#define JOB_DISPLAY_ORDER_PARAMEDIC 23
#define JOB_DISPLAY_ORDER_CHEMIST 24
#define JOB_DISPLAY_ORDER_GENETICIST 25
#define JOB_DISPLAY_ORDER_VIROLOGIST 26
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27
#define JOB_DISPLAY_ORDER_SCIENTIST 28
#define JOB_DISPLAY_ORDER_ROBOTICIST 29
#define JOB_DISPLAY_ORDER_VIROLOGIST 25
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26
#define JOB_DISPLAY_ORDER_SCIENTIST 27
#define JOB_DISPLAY_ORDER_ROBOTICIST 28
#define JOB_DISPLAY_ORDER_GENETICIST 29
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30
#define JOB_DISPLAY_ORDER_WARDEN 30
#define JOB_DISPLAY_ORDER_DETECTIVE 31
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 32
#define JOB_DISPLAY_ORDER_WARDEN 31
#define JOB_DISPLAY_ORDER_DETECTIVE 32
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33
code/game/area/Space_Station_13_areas.dm
+4
View File
@@ -901,6 +901,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "toxmix"
valid_territory = FALSE
/area/science/genetics
name = "Genetics Lab"
icon_state = "geneticssci"
/area/science/misc_lab
name = "Testing Lab"
icon_state = "toxmisc"
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -243,7 +243,7 @@
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/under/rank/rnd/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,
code/modules/antagonists/devil/devil_helpers.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/item/clothing/under/rank/rnd/scientist = 1,
/obj/item/clothing/under/rank/medical/chemist = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer = 1,
/obj/item/clothing/under/rank/medical/geneticist = 1,
/obj/item/clothing/under/rank/rnd/geneticist = 1,
/obj/item/clothing/under/rank/medical/virologist = 1,
/obj/item/clothing/under/rank/medical/doctor/nurse = 1,
/obj/item/clothing/under/rank/medical/doctor = 1,
code/modules/cargo/packs.dm
+3 -3
View File
@@ -2333,19 +2333,19 @@
/datum/supply_pack/costumes_toys/wardrobes/medical
name = "Medical Wardrobe Supply Crate"
desc = "This crate contains refills for the MediDrobe, ChemDrobe, GeneDrobe, and ViroDrobe."
desc = "This crate contains refills for the MediDrobe, ChemDrobe, and ViroDrobe."
cost = 3000
contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe,
/obj/item/vending_refill/wardrobe/chem_wardrobe,
/obj/item/vending_refill/wardrobe/gene_wardrobe,
/obj/item/vending_refill/wardrobe/viro_wardrobe)
crate_name = "medical department wardrobe supply crate"
/datum/supply_pack/costumes_toys/wardrobes/science
name = "Science Wardrobe Supply Crate"
desc = "This crate contains refills for the SciDrobe and RoboDrobe."
desc = "This crate contains refills for the SciDrobe, GeneDrobe, and RoboDrobe."
cost = 1500
contains = list(/obj/item/vending_refill/wardrobe/robo_wardrobe,
/obj/item/vending_refill/wardrobe/gene_wardrobe,
/obj/item/vending_refill/wardrobe/science_wardrobe)
crate_name = "science department wardrobe supply crate"
code/modules/clothing/under/jobs/medical.dm
-17
View File
@@ -19,23 +19,6 @@
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
name = "geneticist's jumpsuit"
icon_state = "genetics"
item_state = "w_suit"
permeability_coefficient = 0.5
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/geneticist/skirt
name = "geneticist's jumpskirt"
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
icon_state = "geneticswhite_skirt"
item_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/medical/virologist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
name = "virologist's jumpsuit"
code/modules/clothing/under/jobs/rnd.dm
+17
View File
@@ -87,3 +87,20 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
/obj/item/clothing/under/rank/rnd/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
name = "geneticist's jumpsuit"
icon_state = "genetics"
item_state = "w_suit"
permeability_coefficient = 0.5
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/rnd/geneticist/skirt
name = "geneticist's jumpskirt"
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
icon_state = "geneticswhite_skirt"
item_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
code/modules/jobs/access.dm
+1 -1
View File
@@ -170,7 +170,7 @@
if(2) //security
return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS)
if(3) //medbay
return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY)
return list(ACCESS_MEDICAL, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY)
if(4) //research
return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK)
if(5) //engineering and maintenance
code/modules/jobs/job_types/geneticist.dm
+5 -5
View File
@@ -1,20 +1,20 @@
/datum/job/geneticist
title = "Geneticist"
flag = GENETICIST
department_head = list("Chief Medical Officer", "Research Director")
department_head = list("Research Director")
department_flag = MEDSCI
faction = "Station"
total_positions = 2
spawn_positions = 2
supervisors = "the chief medical officer and research director"
supervisors = "the research director"
selection_color = "#ffeef0"
exp_type = EXP_TYPE_CREW
exp_requirements = 60
outfit = /datum/outfit/job/geneticist
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
access = list(ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE)
minimal_access = list(ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
@@ -26,7 +26,7 @@
belt = /obj/item/pda/geneticist
ears = /obj/item/radio/headset/headset_medsci
uniform = /obj/item/clothing/under/rank/medical/geneticist
uniform = /obj/item/clothing/under/rank/rnd/geneticist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/genetics
suit_store = /obj/item/flashlight/pen
code/modules/jobs/jobs.dm
+1 -1
View File
@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(medical_positions, list(
"Chief Medical Officer",
"Medical Doctor",
"Paramedic",
"Geneticist",
"Virologist",
"Chemist"))
@@ -25,6 +24,7 @@ GLOBAL_LIST_INIT(medical_positions, list(
GLOBAL_LIST_INIT(science_positions, list(
"Research Director",
"Scientist",
"Geneticist",
"Roboticist"))
code/modules/vending/wardrobes.dm
+2 -2
View File
@@ -391,8 +391,8 @@
icon_state = "genedrobe"
product_ads = "Perfect for the mad scientist in you!"
vend_reply = "Thank you for using the GeneDrobe!"
products = list(/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/under/rank/medical/geneticist/skirt = 2,
products = list(/obj/item/clothing/under/rank/rnd/geneticist = 2,
/obj/item/clothing/under/rank/rnd/geneticist/skirt = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,
icons/mob/clothing/back.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 102 KiB

icons/mob/clothing/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 355 KiB

After

Width:  |  Height:  |  Size: 355 KiB

icons/mob/clothing/under/medical.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

icons/mob/clothing/under/rnd.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

icons/mob/hud.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

icons/mob/inhands/equipment/backpack_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

icons/mob/inhands/equipment/backpack_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

icons/obj/card.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

icons/obj/clothing/under/medical.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

icons/obj/clothing/under/rnd.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

icons/obj/storage.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

icons/obj/vending.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

icons/turf/areas.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

strings/ion_laws.json
-1
View File
@@ -332,7 +332,6 @@
"RESEARCH DIRECTORS",
"CHIEF MEDICAL OFFICERS",
"MEDICAL DOCTORS",
"PARAMEDICS",
"CHEMISTS",
"GENETICISTS",
"VIROLOGISTS",
tools/mapmerge2/map_scripts/clothingunderrepath.txt
+2 -2
View File
@@ -151,8 +151,8 @@
/obj/item/clothing/under/rank/medical/purple : /obj/item/clothing/under/rank/medical/doctor/purple
/obj/item/clothing/under/rank/medical/skirt : /obj/item/clothing/under/rank/medical/doctor/skirt
/obj/item/clothing/under/rank/nursesuit : /obj/item/clothing/under/rank/medical/doctor/nurse
/obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/medical/geneticist
/obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/medical/geneticist/skirt
/obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/rnd/geneticist
/obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/rnd/geneticist/skirt
/obj/item/clothing/under/rank/virologist : /obj/item/clothing/under/rank/medical/virologist
/obj/item/clothing/under/rank/virologist/skirt : /obj/item/clothing/under/rank/medical/virologist/skirt
/obj/item/clothing/under/rank/chemist : /obj/item/clothing/under/rank/medical/chemist