Merge branch 'master' into emote-ports

SPLURT-Station · Aug 15, 2024 · 312579f · 312579f
2 parents 62eb3fb + 27f9dbe
commit 312579f
Show file tree

Hide file tree

Showing 242 changed files with 4,819 additions and 716 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,4 +4,4 @@ about: Suggest an idea for this project
 
 ---
 
-Feature requests are not handled in the repository, aside from already approved bounties. The best place to suggest and discuss features is on the discord at https://discord.gg/AvjrTqnqEx in the `#suggestions` channel
+Feature requests are not handled in the repository, aside from already approved bounties. The best place to suggest and discuss features is on the discord at https://discord.gg/wynHVMzHzC in the `#suggestions` channel
diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -557,15 +557,6 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/ruin/space/has_grav/infested_frigate)
-"hX" = (
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/mapping_helpers/airalarm/all_access,
-/obj/machinery/icecream_vat{
-	desc = "Waffle co. actually ordered these guys to steal one of these just to be sure."
-	},
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/infested_frigate)
 "ie" = (
 /obj/structure/showcase/machinery{
 	icon_state = "autolathe";
@@ -849,6 +840,17 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/infested_frigate)
+"nU" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "floor5-old"
+	},
+/obj/item/ammo_casing/spent,
+/obj/item/gun/ballistic/automatic/smartgun,
+/obj/effect/mob_spawn/corpse/human/syndicatepilot,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/infested_frigate)
 "oj" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/poddoor{
@@ -2121,23 +2123,6 @@
 /obj/machinery/power/smes,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/infested_frigate)
-"IO" = (
-/obj/structure/cable,
-/obj/structure/alien/weeds,
-/obj/effect/decal/cleanable/blood/gibs{
-	icon_state = "floor6-old"
-	},
-/obj/item/shard{
-	icon_state = "plastitaniumtiny"
-	},
-/mob/living/basic/alien/queen/large{
-	loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/smartgun,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
-	desc = "What you saw in your dreams last night.";
-	faction = list("syndicate","xenomorph")
-	},
-/obj/structure/alien/egg/burst,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/infested_frigate)
 "IS" = (
 /obj/item/ammo_casing/spent,
 /obj/item/ammo_casing/spent,
@@ -2173,17 +2158,6 @@
 /obj/machinery/newscaster/directional/north,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/infested_frigate)
-"Jq" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood{
-	icon_state = "floor5-old"
-	},
-/obj/item/ammo_casing/spent,
-/obj/item/gun/ballistic/automatic/smartgun,
-/obj/effect/mob_spawn/corpse/human/syndicatepilot,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/infested_frigate)
 "Jw" = (
 /obj/effect/spawner/random/exotic/antag_gear_weak{
 	pixel_y = 5
@@ -2501,6 +2475,15 @@
 /obj/machinery/computer/operating,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/infested_frigate)
+"NW" = (
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/icecream_vat{
+	desc = "Waffle Corp. actually ordered these guys to steal one of these just to be sure."
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/infested_frigate)
 "NX" = (
 /obj/structure/table/glass,
 /obj/effect/decal/cleanable/glass,
@@ -2797,6 +2780,23 @@
 /obj/item/ammo_casing/spent,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/infested_frigate)
+"SM" = (
+/obj/structure/cable,
+/obj/structure/alien/weeds,
+/obj/effect/decal/cleanable/blood/gibs{
+	icon_state = "floor6-old"
+	},
+/obj/item/shard{
+	icon_state = "plastitaniumtiny"
+	},
+/mob/living/basic/alien/queen/large{
+	loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/smartgun,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
+	desc = "What you saw in your dreams last night.";
+	faction = list("syndicate","xenomorph")
+	},
+/obj/structure/alien/egg/burst,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/infested_frigate)
 "SS" = (
 /obj/structure/table_frame,
 /obj/effect/decal/cleanable/glass,
@@ -3373,8 +3373,8 @@ fl
 wP
 EQ
 wP
-hX
-IO
+NW
+SM
 ME
 KT
 LF
@@ -3861,7 +3861,7 @@ bM
 Ne
 wP
 bE
-Jq
+nU
 ML
 wP
 UX

diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
@@ -4429,6 +4429,7 @@
 /obj/item/stack/sheet/mineral/gold{
 	amount = 25
 	},
+/obj/item/disk/design_disk/long_range_pda,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/port_tarkon/developement)
 "EG" = (
@@ -7350,6 +7351,7 @@
 /obj/item/raw_anomaly_core/random,
 /obj/item/raw_anomaly_core/random,
 /obj/item/raw_anomaly_core/random,
+/obj/item/computer_disk/ordnance,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/port_tarkon/developement)
 "YT" = (

diff --git a/_maps/safehouses/skyrat_ancientmilsim.dmm b/_maps/safehouses/skyrat_ancientmilsim.dmm
@@ -53,7 +53,7 @@
 "j" = (
 /obj/effect/landmark/bitrunning/cache_goal_turf,
 /obj/effect/turf_decal/loading_area,
-/turf/open/floor/bitrunning_transport,
+/turf/open/indestructible/bitrunning_transport,
 /area/virtual_domain/safehouse)
 "m" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -161,7 +161,7 @@
 /obj/effect/landmark/bitrunning/cache_goal_turf,
 /obj/effect/turf_decal/loading_area,
 /obj/machinery/light/small/directional/south,
-/turf/open/floor/bitrunning_transport,
+/turf/open/indestructible/bitrunning_transport,
 /area/virtual_domain/safehouse)
 "I" = (
 /obj/effect/turf_decal/tile/neutral,

diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
@@ -100,9 +100,9 @@
 #define ui_iclothing "WEST:6,SOUTH+1:7"
 #define ui_oclothing "WEST+1:8,SOUTH+1:7"
 #define ui_gloves "WEST+2:10,SOUTH+1:7"
-#define ui_glasses "WEST:6,SOUTH+3:11"
+#define ui_glasses "WEST+2:10,SOUTH+2:9" //SPLURT EDIT
 #define ui_mask "WEST+1:8,SOUTH+2:9"
-#define ui_ears "WEST+2:10,SOUTH+2:9"
+#define ui_ears "WEST+2:10,SOUTH+3:11" //SPLURT EDIT
 #define ui_neck "WEST:6,SOUTH+2:9"
 #define ui_head "WEST+1:8,SOUTH+3:11"
 

diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
@@ -32,7 +32,7 @@
 /// Glasses slot
 #define ITEM_SLOT_EYES (1<<3)
 /// Ear slot (radios, earmuffs)
-#define ITEM_SLOT_EARS (1<<4)
+#define ITEM_SLOT_EARS_LEFT (1<<4) //SPLURT EDIT
 /// Mask slot
 #define ITEM_SLOT_MASK (1<<5)
 /// Head slot (helmets, hats, etc.)
@@ -65,15 +65,15 @@
 #define ITEM_SLOT_LEGCUFFED (1<<19)
 
 /// Total amount of slots
-#define SLOTS_AMT 20 // Keep this up to date!
+#define SLOTS_AMT 26 // Keep this up to date!
 
 ///Inventory slots that can be blacklisted by a species from being equipped into
 DEFINE_BITFIELD(no_equip_flags, list(
 	"EXOSUIT" = ITEM_SLOT_OCLOTHING,
 	"JUMPSUIT" = ITEM_SLOT_ICLOTHING,
 	"GLOVES" = ITEM_SLOT_GLOVES,
 	"GLASSES" = ITEM_SLOT_EYES,
-	"EARPIECES" = ITEM_SLOT_EARS,
+	"EARPIECES" = ITEM_SLOT_EARS_LEFT,
 	"MASKS" = ITEM_SLOT_MASK,
 	"HATS" = ITEM_SLOT_HEAD,
 	"SHOES" = ITEM_SLOT_FEET,
@@ -83,6 +83,10 @@ DEFINE_BITFIELD(no_equip_flags, list(
 
 //SLOT GROUP HELPERS
 #define ITEM_SLOT_POCKETS (ITEM_SLOT_LPOCKET|ITEM_SLOT_RPOCKET)
+
+// SPLURT EDIT - EARS HELPER
+#define ITEM_SLOT_EARS (ITEM_SLOT_EARS_LEFT|ITEM_SLOT_EARS_RIGHT)
+
 /// Slots that are physically on you
 #define ITEM_SLOT_ON_BODY (ITEM_SLOT_ICLOTHING | ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_EYES | ITEM_SLOT_EARS | \
 	ITEM_SLOT_MASK | ITEM_SLOT_HEAD | ITEM_SLOT_FEET | ITEM_SLOT_ID | ITEM_SLOT_BELT | ITEM_SLOT_BACK | ITEM_SLOT_NECK )
@@ -122,6 +126,13 @@ DEFINE_BITFIELD(no_equip_flags, list(
 #define HIDETAUR (1<<18)
 //SKYRAT EDIT ADDITION END
 
+//SPLURT EDIT
+/// hides underwear, socks and shirt
+#define HIDEUNDERWEAR	(1<<19)
+/// hides wrists
+#define HIDEWRISTS		(1<<20)
+// SPLURT EDIT END
+
 //bitflags for clothing coverage - also used for limbs
 #define HEAD (1<<0)
 #define CHEST (1<<1)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -691,48 +691,58 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list(
 /// Total number of layers for mob overlays
 /// KEEP THIS UP-TO-DATE OR SHIT WILL BREAK
 /// Also consider updating layers_to_offset
-#define TOTAL_LAYERS 41 // SKYRAT EDIT CHANGE - ORIGINAL: 35
+#define TOTAL_LAYERS 47 // SKYRAT EDIT CHANGE - ORIGINAL: 35
 /// Mutations layer - Tk headglows, cold resistance glow, etc
-#define MUTATIONS_LAYER 41 // SKYRAT EDIT CHANGE - ORIGINAL: 35
+#define MUTATIONS_LAYER 47 // SKYRAT EDIT CHANGE - ORIGINAL: 35
 /// Mutantrace features (tail when looking south) that must appear behind the body parts
-#define BODY_BEHIND_LAYER 40 // SKYRAT EDIT CHANGE - ORIGINAL: 34
+#define BODY_BEHIND_LAYER 46 // SKYRAT EDIT CHANGE - ORIGINAL: 34
 /// Layer for bodyparts that should appear behind every other bodypart - Mostly, legs when facing WEST or EAST
-#define BODYPARTS_LOW_LAYER 39 // SKYRAT EDIT CHANGE - ORIGINAL: 33
+#define BODYPARTS_LOW_LAYER 45 // SKYRAT EDIT CHANGE - ORIGINAL: 33
 /// Layer for most bodyparts, appears above BODYPARTS_LOW_LAYER and below BODYPARTS_HIGH_LAYER
-#define BODYPARTS_LAYER 38 // SKYRAT EDIT CHANGE - ORIGINAL: 32
+#define BODYPARTS_LAYER 44 // SKYRAT EDIT CHANGE - ORIGINAL: 32
 /// Mutantrace features (snout, body markings) that must appear above the body parts
-#define BODY_ADJ_LAYER 37 // SKYRAT EDIT CHANGE - ORIGINAL: 31
+#define BODY_ADJ_LAYER 43 // SKYRAT EDIT CHANGE - ORIGINAL: 31
 /// Underwear, undershirts, socks, eyes, lips(makeup)
-#define BODY_LAYER 36 // SKYRAT EDIT CHANGE - ORIGINAL: 30
+#define BODY_LAYER 42 // SKYRAT EDIT CHANGE - ORIGINAL: 30
 /// Mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
-#define FRONT_MUTATIONS_LAYER 35 // SKYRAT EDIT CHANGE - ORIGINAL: 29
+#define FRONT_MUTATIONS_LAYER 41 // SKYRAT EDIT CHANGE - ORIGINAL: 29
 /// Damage indicators (cuts and burns)
-#define DAMAGE_LAYER 34 // SKYRAT EDIT CHANGE - ORIGINAL: 28
+#define DAMAGE_LAYER 40 // SKYRAT EDIT CHANGE - ORIGINAL: 28
 // SKYRAT EDIT ADDITION START
 /// This layer is used for things that shouldn't be over clothes, but should be over mutations
-#define BODY_FRONT_UNDER_CLOTHES 33
+#define BODY_FRONT_UNDER_CLOTHES 39
 // SKYRAT EDIT ADDITION END
+// SPLURT EDIT undies
+#define UNDERWEAR_LAYER			38
+#define SOCKS_LAYER				37
+#define BRA_LAYER				36
+#define SHIRT_LAYER				35
+// SPLURT EDIT END
 /// Jumpsuit clothing layer
-#define UNIFORM_LAYER 32 // SKYRAT EDIT CHANGE - ORIGINAL: 27
+#define UNIFORM_LAYER 34 // SKYRAT EDIT CHANGE - ORIGINAL: 27 //SPLURT EDIT undies
 // SKYRAT EDIT ADDITION BEGIN - cursed layers under clothing
-#define ANUS_LAYER 31
-#define VAGINA_LAYER 30
-#define PENIS_LAYER 29
-#define NIPPLES_LAYER 28
-#define BANDAGE_LAYER 27
+#define ANUS_LAYER 33
+#define VAGINA_LAYER 32
+#define PENIS_LAYER 31
+#define NIPPLES_LAYER 30
+#define BANDAGE_LAYER 29
 //SKYRAT EDIT ADDITION END
 /// ID card layer
-#define ID_LAYER 26
+#define ID_LAYER 28
 /// ID card layer (might be deprecated)
-#define ID_CARD_LAYER 25
+#define ID_CARD_LAYER 27
 /// Layer for bodyparts that should appear above every other bodypart - Currently only used for hands
-#define BODYPARTS_HIGH_LAYER 24
+#define BODYPARTS_HIGH_LAYER 26
 /// Gloves layer
-#define GLOVES_LAYER 23
+#define GLOVES_LAYER 25
+/// Wrists layer
+#define WRISTS_LAYER 24
 /// Shoes layer
-#define SHOES_LAYER 22
+#define SHOES_LAYER 23
 /// Layer for masks that are worn below ears and eyes (like Balaclavas) (layers below hair, use flagsinv=HIDEHAIR as needed)
-#define LOW_FACEMASK_LAYER 21
+#define LOW_FACEMASK_LAYER 22
+/// SPLURT EDIT - Extra ears layer
+#define EARS_EXTRA_LAYER 21
 /// Ears layer (Spessmen have ears? Wow)
 #define EARS_LAYER 20
 /// Layer for neck apperal that should appear below the suit slot (like neckties)

diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
@@ -238,3 +238,5 @@ GLOBAL_LIST_INIT(announcer_keys, list(
 #define SFX_PORTAL_CLOSE "portal_closed"
 #define SFX_PORTAL_CREATED "portal_created"
 #define SFX_SCREECH "screech"
+#define SFX_STONE_DROP "stone_drop"
+#define SFX_STONE_PICKUP "stone_pickup"
diff --git a/code/__DEFINES/~skyrat_defines/synth_defines.dm b/code/__DEFINES/~skyrat_defines/synth_defines.dm
@@ -22,7 +22,19 @@
 #define SYNTH_EMP_BRAIN_DAMAGE_MAXIMUM 75
 
 // Universal stat defines
-#define SYNTH_BAD_EFFECT_DURATION 30 SECONDS
+#define SYNTH_BAD_EFFECT_DURATION 20 SECONDS
 #define SYNTH_HEART_DAMAGE_MESSAGE_INTERVAL 20 SECONDS
 #define SYNTH_BRAIN_DAMAGE_MESSAGE_INTERVAL 20 SECONDS
 #define SYNTH_DEAF_STACKS 30
+
+// Charge level defines
+#define SYNTH_CHARGE_MAX (STANDARD_CELL_CHARGE * 20) //Takes two high capacity cells to go from 0 to 100
+#define SYNTH_JOULES_PER_NUTRITION (SYNTH_CHARGE_MAX / NUTRITION_LEVEL_FULL)
+#define SYNTH_CHARGE_ALMOST_FULL (NUTRITION_LEVEL_ALMOST_FULL * SYNTH_JOULES_PER_NUTRITION)
+#define SYNTH_CHARGE_RATE (STANDARD_CELL_RATE * 2.5)
+#define SYNTH_APC_MINIMUM_PERCENT 20
+
+/// Mechfab defines
+#define RND_SUBCATEGORY_MECHFAB_ANDROID "/Android"
+#define RND_SUBCATEGORY_MECHFAB_ANDROID_CHASSIS "/Android Chassis"
+#define RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS "/Android Organs"
diff --git a/code/__DEFINES/~skyrat_defines/techweb_nodes.dm b/code/__DEFINES/~skyrat_defines/techweb_nodes.dm
@@ -1,4 +1,6 @@
 #define TECHWEB_NODE_ADVANCED_VISION "adv_vision"
+#define TECHWEB_NODE_ANDROID_ORGANS "android_organs"
+#define TECHWEB_NODE_ANDROID_CHASSIS "android_chassis"
 #define TECHWEB_NODE_BORG_SHAPESHIFTER "borg_shapeshifter"
 #define TECHWEB_NODE_CARGO_TELEPORTER "cargoteleporter"
 #define TECHWEB_NODE_COLONY_APPLIANCES "colony_fabricator_appliances"

diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm
@@ -123,6 +123,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_REVIVES_BY_HEALING "trait_revives_by_healing"
 #define TRAIT_ROBOTIC_DNA_ORGANS "trait_robotic_dna_organs"
 
+// Isolation trait for synths
+#define TRAIT_SYNTHETIC "trait_synthetic"
+
 //Defines for model features, set in the model_features list of a robot model datum. Are they a dogborg? Is the model small? etc.
 /// Cyborgs with unique sprites for when they get totally broken down.
 #define TRAIT_R_UNIQUEWRECK "unique_wreck"

diff --git a/code/__DEFINES/~~~splurt_defines/hud.dm b/code/__DEFINES/~~~splurt_defines/hud.dm
@@ -10,3 +10,12 @@
 #define ui_building "EAST-5:22,SOUTH:21"
 #define ui_language_menu "EAST-5:6,SOUTH:21"
 #define ui_navigate_menu "EAST-5:22,SOUTH:5"
+
+// Extra inventory
+#define ui_inventory_extra "WEST:6,SOUTH+3:11"
+#define ui_boxers "WEST:6,SOUTH+4:13"
+#define ui_socks "WEST:6,SOUTH+5:15"
+#define ui_shirt "WEST:6,SOUTH+6:17"
+#define ui_bra "WEST+1:8,SOUTH+5:15"
+#define ui_ears_extra "WEST+2:10,SOUTH+4:13"
+#define ui_wrists "WEST+1:8,SOUTH+4:13"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ about: Suggest an idea for this project

		---

		Feature requests are not handled in the repository, aside from already approved bounties. The best place to suggest and discuss features is on the discord at https://discord.gg/AvjrTqnqEx in the `#suggestions` channel
		Feature requests are not handled in the repository, aside from already approved bounties. The best place to suggest and discuss features is on the discord at https://discord.gg/wynHVMzHzC in the `#suggestions` channel