Skip to content

Commit

Permalink
Merge branch 'master' into hollowpointsWOOOOOOOOO
Browse files Browse the repository at this point in the history
  • Loading branch information
@generalthrax
generalthrax authored May 15, 2024
2 parents 07e9af3 + e6c20d0 commit 7026d40
Show file tree
Hide file tree
Showing 38 changed files with 409 additions and 121 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5611,7 +5611,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"LM" = (
/obj/structure/closet,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/ammo_box/magazine/m10mm,
Expand Down Expand Up @@ -7296,7 +7296,7 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/vomit/old,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/shoes/combat,
/turf/open/floor/mineral/plastitanium,
/area/ruin/jungle/starport/tower)
Expand Down
12 changes: 6 additions & 6 deletions _maps/configs/syndicate_gorlex_hyena.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@
"map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm",
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
"outfit": "/datum/outfit/job/syndicate/captain/ngr",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/syndicate/ce/gorlex/ngr",
"outfit": "/datum/outfit/job/syndicate/ce/ngr",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
"outfit": "/datum/outfit/job/syndicate/engineer/ngr",
"slots": 1
},
"Wrecker": {
"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
"outfit": "/datum/outfit/job/syndicate/miner/ngr",
"slots": 2
},
"Junior Agent": {
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex/ngr",
"Initiate": {
"outfit": "/datum/outfit/job/syndicate/assistant/ngr",
"slots": 2
}
},
Expand Down
106 changes: 53 additions & 53 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
},
/obj/item/storage/backpack/security,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/ngrcap,
/obj/item/clothing/head/ngr/peaked,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/a357/match,
Expand All @@ -75,10 +75,6 @@
icon_state = "syndicate";
name = "armor locker"
},
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/head/helmet/operator,
/obj/item/clothing/head/helmet/operator,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/radio/intercom/directional/west{
pixel_y = -5
Expand All @@ -91,6 +87,12 @@
/obj/machinery/light/small/directional/west{
pixel_y = 7
},
/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
/obj/item/clothing/suit/armor/ngr,
/obj/item/clothing/suit/armor/ngr,
/obj/item/clothing/head/helmet/ngr,
/obj/item/clothing/head/helmet/ngr,
/turf/open/floor/mineral/plastitanium,
/area/ship/security/armory)
"bN" = (
Expand Down Expand Up @@ -882,14 +884,10 @@
"pt" = (
/obj/effect/turf_decal/industrial/outline,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/gloves/explorer,
/obj/item/clothing/accessory/armband/cargo,
/obj/item/storage/belt/mining,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/soft/grey,
/obj/machinery/light/small/directional/north,
/obj/structure/closet/secure_closet{
anchored = 1;
Expand All @@ -899,15 +897,9 @@
},
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/industrial/outline,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/gloves/explorer,
/obj/item/clothing/accessory/armband/cargo,
/obj/item/storage/belt/mining,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/soft/grey,
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/suit/hazardvest/ngr,
/obj/item/clothing/head/hardhat/ngr,
/turf/open/floor/plasteel/tech/grid,
/area/ship/storage)
"pu" = (
Expand Down Expand Up @@ -1028,21 +1020,20 @@
req_access = list(11)
},
/obj/item/clothing/shoes/workboots,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/accessory/armband/engine,
/obj/item/clothing/suit/hazardvest,
/obj/item/storage/belt/utility,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/hardhat,
/obj/item/clothing/head/soft/yellow,
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/machinery/light_switch{
dir = 1;
pixel_y = -16;
pixel_x = -12
},
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/suit/hazardvest/ngr,
/obj/item/clothing/head/hardhat/ngr,
/turf/open/floor/plasteel/tech/grid,
/area/ship/storage)
"rM" = (
Expand Down Expand Up @@ -1154,15 +1145,14 @@
req_access = list(48)
},
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/gloves/explorer,
/obj/item/clothing/accessory/armband/cargo,
/obj/item/storage/belt/mining,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/hardhat/orange,
/obj/item/clothing/head/soft/grey,
/obj/machinery/airalarm/directional/north,
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/suit/hazardvest/ngr,
/obj/item/clothing/head/hardhat/ngr,
/turf/open/floor/plasteel/tech/grid,
/area/ship/storage)
"tI" = (
Expand Down Expand Up @@ -1340,6 +1330,18 @@
/area/ship/crew)
"wP" = (
/obj/effect/turf_decal/industrial/outline,
/obj/structure/closet/crate{
name = "desert equipment crate";
desc = "A rectangular steel crate containing supplies to survive a desert environment more easily."
},
/obj/item/clothing/neck/shemagh/ngr,
/obj/item/clothing/neck/shemagh/ngr,
/obj/item/clothing/neck/shemagh/ngr,
/obj/item/clothing/neck/shemagh/ngr,
/obj/item/clothing/head/ngr/flap,
/obj/item/clothing/head/ngr/flap,
/obj/item/clothing/head/ngr/flap,
/obj/item/clothing/head/ngr/flap,
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
"xm" = (
Expand Down Expand Up @@ -1489,38 +1491,39 @@
/obj/structure/closet/wall/red/directional/east{
name = "uniform closet"
},
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/tank/jetpack/suit,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/head/ngr,
/obj/item/clothing/head/ngr,
/obj/item/clothing/head/ngr,
/obj/item/clothing/head/ngr,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
/obj/item/radio,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
/turf/open/floor/plasteel/dark,
/area/ship/crew/dorm)
"zA" = (
Expand Down Expand Up @@ -1642,26 +1645,23 @@
name = "foreman's locker";
req_access = list(56)
},
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/toggle/industrial,
/obj/item/clothing/gloves/combat,
/obj/item/storage/belt/utility/chief{
name = "\improper Foreman's toolbelt"
},
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/hardhat/white,
/obj/item/clothing/head/beret/ce{
name = "foreman beret"
},
/obj/item/storage/toolbox/syndicate,
/obj/item/wrench/combat,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/clothing/accessory/holster,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/machinery/airalarm/directional/west,
/obj/item/clothing/suit/ngr,
/obj/item/clothing/head/hardhat/ngr/foreman,
/obj/item/tank/jetpack/suit,
/turf/open/floor/carpet/red,
/area/ship/cargo/office)
Expand Down Expand Up @@ -1692,7 +1692,7 @@
dir = 4;
pixel_x = -20
},
/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/carpet/black,
/area/ship/bridge)
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
req_access = list(3,150)
},
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/head/ngrcap,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/head/ngr/peaked,
/obj/item/clothing/shoes/combat,
/obj/item/megaphone/sec{
name = "syndicate megaphone"
Expand Down Expand Up @@ -2367,7 +2367,7 @@
dir = 8
},
/obj/machinery/suit_storage_unit/syndicate{
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg;
suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/ngr;
name = "lieutenant's suit storage unit"
},
/turf/open/floor/mineral/plastitanium,
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/structures/lavaland/geyser.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
name = "plunger"
desc = "It's a plunger for plunging."
icon = 'icons/obj/watercloset.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
icon_state = "plunger"

slot_flags = ITEM_SLOT_MASK
Expand Down
Loading

0 comments on commit 7026d40

Please sign in to comment.