Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …
Browse files Browse the repository at this point in the history 
…into upstream-mirror-583
  • Loading branch information
@Iajret
Iajret committed Jan 24, 2024
2 parents 0b5e2b1 + 3eb3646 commit 3cbee93
Show file tree
Hide file tree
Showing 209 changed files with 2,216 additions and 811 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files/NSVBlueshift/Blueshift.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18359,7 +18359,7 @@
/obj/item/clothing/suit/jacket/letterman_syndie,
/obj/item/clothing/suit/jacket/miljacket,
/obj/item/clothing/suit/jacket/leather,
/obj/item/clothing/suit/croptop,
/obj/item/clothing/suit/jacket/croptop,
/turf/open/floor/iron/dark,
/area/station/common/tailoring)
"dwK" = (
Expand Down
78 changes: 36 additions & 42 deletions _maps/safehouses/ancientmilsim_nova.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,32 @@
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/virtual_domain/safehouse)
"b" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/closet/crate/secure/weapon,
/obj/item/storage/pouch/medical/firstaid/stabilizer,
/obj/item/storage/pouch/ammo,
/obj/item/clothing/head/helmet/hecu,
/obj/item/clothing/suit/armor/vest/hecu,
/obj/item/storage/medkit/combat_surgeon/stocked,
/obj/item/storage/medkit/civil_defense/stocked,
/obj/item/clothing/glasses/hud/health/night,
/obj/item/storage/belt/military/assault,
/obj/item/storage/box/survival/syndie,
/obj/item/gun/ballistic/automatic/sol_smg,
/obj/item/clothing/head/helmet/sf_peacekeeper,
/obj/item/clothing/suit/armor/sf_peacekeeper,
/obj/item/knife/combat,
/obj/item/gun/ballistic/automatic/pistol/sol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/storage/belt/military/assault/hecu,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/stack/medical/mesh/bloody,
/obj/item/stack/medical/suture/bloody,
/obj/item/clothing/gloves/military,
/obj/item/clothing/glasses/hud/health/night,
/obj/item/gun/ballistic/automatic/sol_smg,
/obj/item/gun/ballistic/automatic/pistol/sol,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/sand/volcanic,
/turf/open/floor/iron,
/area/virtual_domain/safehouse)
"e" = (
Expand Down Expand Up @@ -131,29 +130,27 @@
/turf/open/floor/iron,
/area/virtual_domain/safehouse)
"G" = (
/obj/effect/turf_decal/stripes/end,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/weapon,
/obj/item/storage/pouch/medical/firstaid/stabilizer,
/obj/item/storage/pouch/ammo,
/obj/item/clothing/head/helmet/hecu,
/obj/item/clothing/suit/armor/vest/hecu,
/obj/item/storage/medkit/combat_surgeon/stocked,
/obj/item/storage/medkit/civil_defense/stocked,
/obj/item/clothing/glasses/hud/health/night,
/obj/item/storage/belt/military/assault,
/obj/item/storage/box/survival/syndie,
/obj/item/gun/ballistic/automatic/sol_smg,
/obj/item/clothing/head/helmet/sf_peacekeeper,
/obj/item/clothing/suit/armor/sf_peacekeeper,
/obj/item/knife/combat,
/obj/item/gun/ballistic/automatic/pistol/sol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/storage/belt/military/assault/hecu,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/stack/medical/mesh/bloody,
/obj/item/stack/medical/suture/bloody,
/obj/item/clothing/gloves/military,
/obj/item/clothing/glasses/hud/health/night,
/obj/item/gun/ballistic/automatic/sol_smg,
/obj/item/gun/ballistic/automatic/pistol/sol,
/obj/effect/turf_decal/stripes/end,
/obj/effect/turf_decal/sand/volcanic,
/turf/open/floor/iron,
/area/virtual_domain/safehouse)
"H" = (
Expand All @@ -170,7 +167,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer{
dir = 2;
name = "hovercraft console";
icon_screen = "shuttle";
desc = "An armored hovercraft control computer. Doesn't work anymore... who would've thought."
Expand Down Expand Up @@ -223,26 +219,24 @@
},
/obj/effect/turf_decal/sand/volcanic,
/obj/structure/closet/crate/secure/weapon,
/obj/item/storage/pouch/medical/firstaid/loaded,
/obj/item/storage/pouch/medical/loaded,
/obj/item/clothing/head/helmet/hecu,
/obj/item/clothing/suit/armor/vest/hecu,
/obj/item/storage/medkit/combat_surgeon/stocked,
/obj/item/storage/medkit/civil_defense/stocked,
/obj/item/clothing/glasses/hud/health/night,
/obj/item/storage/belt/military/assault,
/obj/item/storage/box/survival/syndie,
/obj/item/gun/ballistic/automatic/sol_smg,
/obj/item/clothing/head/helmet/sf_peacekeeper,
/obj/item/clothing/suit/armor/sf_peacekeeper,
/obj/item/knife/combat,
/obj/item/gun/ballistic/automatic/pistol/sol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/storage/belt/military/assault/hecu,
/obj/item/ammo_box/magazine/c35sol_pistol,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/stack/medical/mesh/bloody,
/obj/item/stack/medical/suture/bloody,
/obj/item/clothing/gloves/military,
/obj/item/clothing/glasses/hud/health/night,
/obj/item/gun/ballistic/automatic/sol_smg,
/obj/item/gun/ballistic/automatic/pistol/sol,
/turf/open/floor/iron,
/area/virtual_domain/safehouse)

Expand Down
7 changes: 2 additions & 5 deletions _maps/shuttles/cargo_birdshot.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
},
/turf/open/floor/mineral/titanium,
/area/shuttle/supply)
"t" = (
/turf/closed/wall/mineral/titanium/nosmooth,
/area/shuttle/supply)
"w" = (
/obj/effect/turf_decal/stripes/box,
/obj/machinery/conveyor{
Expand Down Expand Up @@ -247,7 +244,7 @@ T
X
W
Z
t
T
M
J
w
Expand Down Expand Up @@ -289,7 +286,7 @@ T
R
m
i
t
T
P
e
I
Expand Down
11 changes: 4 additions & 7 deletions _maps/templates/battlecruiser_starfury.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5791,9 +5791,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
"ZF" = (
/turf/closed/wall/mineral/plastitanium/nosmooth,
/area/shuttle/sbc_starfury)
"ZK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -5974,7 +5971,7 @@ cH
ow
ae
ae
ZF
ac
aa
aa
aa
Expand Down Expand Up @@ -6110,7 +6107,7 @@ cH
Zl
ae
ae
ZF
ac
aa
aa
aa
Expand Down Expand Up @@ -8014,7 +8011,7 @@ cH
vC
ae
ae
ZF
ac
aa
aa
aa
Expand Down Expand Up @@ -8150,7 +8147,7 @@ cH
xI
ae
ae
ZF
ac
aa
aa
aa
Expand Down
8 changes: 4 additions & 4 deletions _maps/virtual_domains/ancientmilsim_nova.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
/area/virtual_domain/ancient_milsim/snpc_garage)
"gL" = (
/obj/structure/table,
/obj/item/grenade/chem_grenade/clf3,
/obj/item/grenade/stingbang,
/turf/open/floor/plating,
/area/virtual_domain/ancient_milsim/janitor)
"gP" = (
Expand Down Expand Up @@ -1709,7 +1709,7 @@
/turf/open/floor/iron,
/area/virtual_domain/ancient_milsim/snpc_cafe)
"Vr" = (
/obj/item/ammo_box/magazine/lanca,
/obj/item/ammo_box/magazine/wylom,
/turf/open/misc/grass/planet/ancient_milsim,
/area/virtual_domain/ancient_milsim/loot_camp)
"VA" = (
Expand Down Expand Up @@ -4625,7 +4625,7 @@ Uz
(49,1,1) = {"
Uz
Vl
Vr
Vl
Vl
Vl
Vl
Expand Down Expand Up @@ -4682,7 +4682,7 @@ Uz
"}
(50,1,1) = {"
Uz
Vl
Vr
wz
Vl
Vl
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/atom_hud.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
#define SECHUD_BARTENDER "hudbartender"
#define SECHUD_BITRUNNER "hudbitrunner"
#define SECHUD_BOTANIST "hudbotanist"
#define SECHUD_BRIDGE_ASSISTANT "hudbridgeassistant"
#define SECHUD_CAPTAIN "hudcaptain"
#define SECHUD_CARGO_TECHNICIAN "hudcargotechnician"
#define SECHUD_CHAPLAIN "hudchaplain"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/dcs/signals/signals_global.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@
/// (new_name, old_name)
#define COMSIG_GLOB_STATION_NAME_CHANGED "!station_name_changed"

/// Global signal sent before we decide what job everyone has
#define COMSIG_GLOB_PRE_JOBS_ASSIGNED "!pre_roles_assigned"

/// global signal when a global nullrod type is picked
#define COMSIG_GLOB_NULLROD_PICKED "!nullrod_picked"

Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/external_organs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
///Tail wagging
#define WAG_ABLE (1<<0)
#define WAG_WAGGING (1<<1)

/// Tail spine defines
#define SPINE_KEY_LIZARD "lizard"
#define SPINE_KEY_VOX "vox" // NOVA EDIT ADDITION
94 changes: 49 additions & 45 deletions code/__DEFINES/jobs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define JOB_RESEARCH_DIRECTOR "Research Director"
#define JOB_CHIEF_ENGINEER "Chief Engineer"
#define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer"
#define JOB_BRIDGE_ASSISTANT "Bridge Assistant"
//Silicon
#define JOB_AI "AI"
#define JOB_CYBORG "Cyborg"
Expand Down Expand Up @@ -76,10 +77,11 @@
#define JOB_SCIENTIST "Scientist"
#define JOB_ROBOTICIST "Roboticist"
#define JOB_GENETICIST "Geneticist"
#define JOB_SCIENCE_GUARD "Science Guard"
#define JOB_SCIENCE_GUARD "Science Guard" // NOVA EDIT ADDITION
//Supply
#define JOB_QUARTERMASTER "Quartermaster"
#define JOB_CARGO_TECHNICIAN "Cargo Technician"
#define JOB_CARGO_GORILLA "Cargo Gorilla"
#define JOB_SHAFT_MINER "Shaft Miner"
#define JOB_BITRUNNER "Bitrunner"
#define JOB_CUSTOMS_AGENT "Customs Agent" // NOVA EDIT ADDITION
Expand Down Expand Up @@ -145,50 +147,52 @@
#define JOB_DISPLAY_ORDER_ASSISTANT 1
#define JOB_DISPLAY_ORDER_CAPTAIN 2
#define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3
#define JOB_DISPLAY_ORDER_BARTENDER 4
#define JOB_DISPLAY_ORDER_BOTANIST 5
#define JOB_DISPLAY_ORDER_COOK 6
#define JOB_DISPLAY_ORDER_JANITOR 7
#define JOB_DISPLAY_ORDER_CLOWN 8
#define JOB_DISPLAY_ORDER_MIME 9
#define JOB_DISPLAY_ORDER_CURATOR 10
#define JOB_DISPLAY_ORDER_LAWYER 11
#define JOB_DISPLAY_ORDER_CHAPLAIN 12
#define JOB_DISPLAY_ORDER_PSYCHOLOGIST 13
#define JOB_DISPLAY_ORDER_AI 14
#define JOB_DISPLAY_ORDER_CYBORG 15
#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16
#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17
#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18
#define JOB_DISPLAY_ORDER_QUARTERMASTER 19
#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 20
#define JOB_DISPLAY_ORDER_SHAFT_MINER 21
#define JOB_DISPLAY_ORDER_BITRUNNER 22
#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 23
#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 24
#define JOB_DISPLAY_ORDER_PARAMEDIC 25
#define JOB_DISPLAY_ORDER_CHEMIST 26
#define JOB_DISPLAY_ORDER_VIROLOGIST 27
#define JOB_DISPLAY_ORDER_CORONER 28
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 29
#define JOB_DISPLAY_ORDER_SCIENTIST 30
#define JOB_DISPLAY_ORDER_ROBOTICIST 31
#define JOB_DISPLAY_ORDER_GENETICIST 32
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 33
#define JOB_DISPLAY_ORDER_WARDEN 34
#define JOB_DISPLAY_ORDER_DETECTIVE 35
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 36
#define JOB_DISPLAY_ORDER_PRISONER 37
#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 38 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 39 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 40 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_BLUESHIELD 41 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_ORDERLY 42 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 43 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_BOUNCER 44 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 45 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 46 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_EXP_CORPS 47 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_BRIDGE_ASSISTANT 4
#define JOB_DISPLAY_ORDER_BARTENDER 5
#define JOB_DISPLAY_ORDER_BOTANIST 6
#define JOB_DISPLAY_ORDER_COOK 7
#define JOB_DISPLAY_ORDER_JANITOR 8
#define JOB_DISPLAY_ORDER_CLOWN 9
#define JOB_DISPLAY_ORDER_MIME 10
#define JOB_DISPLAY_ORDER_CURATOR 11
#define JOB_DISPLAY_ORDER_LAWYER 12
#define JOB_DISPLAY_ORDER_CHAPLAIN 13
#define JOB_DISPLAY_ORDER_PSYCHOLOGIST 14
#define JOB_DISPLAY_ORDER_AI 15
#define JOB_DISPLAY_ORDER_CYBORG 16
#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 17
#define JOB_DISPLAY_ORDER_STATION_ENGINEER 18
#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 19
#define JOB_DISPLAY_ORDER_QUARTERMASTER 20
#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 21
#define JOB_DISPLAY_ORDER_SHAFT_MINER 22
#define JOB_DISPLAY_ORDER_BITRUNNER 23
#define JOB_DISPLAY_ORDER_CARGO_GORILLA 24
#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 25
#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 26
#define JOB_DISPLAY_ORDER_PARAMEDIC 27
#define JOB_DISPLAY_ORDER_CHEMIST 28
#define JOB_DISPLAY_ORDER_VIROLOGIST 29
#define JOB_DISPLAY_ORDER_CORONER 30
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 31
#define JOB_DISPLAY_ORDER_SCIENTIST 32
#define JOB_DISPLAY_ORDER_ROBOTICIST 33
#define JOB_DISPLAY_ORDER_GENETICIST 34
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 35
#define JOB_DISPLAY_ORDER_WARDEN 36
#define JOB_DISPLAY_ORDER_DETECTIVE 37
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 38
#define JOB_DISPLAY_ORDER_PRISONER 39
#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 40 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_CORRECTIONS_OFFICER 41 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_NANOTRASEN_CONSULTANT 42 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_BLUESHIELD 43 //NOVA EDIT ADDITON
#define JOB_DISPLAY_ORDER_ORDERLY 44 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 45 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_BOUNCER 46 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 47 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 48 //NOVA EDIT ADDITION
#define JOB_DISPLAY_ORDER_EXP_CORPS 49 //NOVA EDIT ADDITON

#define DEPARTMENT_UNASSIGNED "No Department"

Expand Down
Loading

0 comments on commit 3cbee93

Please sign in to comment.