Skip to content

Commit

Permalink
miner
Browse files Browse the repository at this point in the history
  • Loading branch information
meemofcourse committed Feb 6, 2024
1 parent 2ff8536 commit ea14880
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 67 deletions.
117 changes: 58 additions & 59 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"aC" = (
/obj/machinery/light/directional/west,
/obj/structure/table/reinforced,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"aD" = (
/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
dir = 8
Expand Down Expand Up @@ -173,6 +168,13 @@
},
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"br" = (
/obj/effect/turf_decal/syndicateemblem/middle/middle,
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"bv" = (
/obj/structure/dresser,
/obj/effect/turf_decal/corner/transparent/bar/diagonal,
Expand Down Expand Up @@ -580,7 +582,7 @@
/area/ship/security)
"dL" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
dir = 8
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
Expand Down Expand Up @@ -1029,20 +1031,19 @@
req_access = list(150, 48);
populate = 0
},
/obj/item/shovel,
/obj/item/storage/bag/ore,
/obj/item/mining_scanner,
/obj/item/mining_scanner,
/obj/item/pickaxe/mini,
/obj/item/storage/belt/mining/alt,
/obj/item/flashlight/seclite,
/obj/item/stack/sheet/mineral/sandbags,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/gloves/explorer,
/obj/item/clothing/mask/gas/explorer,
/obj/item/radio/headset/syndicate{
keyslot = null
},
/obj/item/clothing/under/syndicate/suns/workerjumpsuit,
/obj/item/clothing/head/safety_helmet/suns,
/obj/item/clothing/suit/toggle/suns/workervest,
/obj/item/clothing/gloves/suns,
/turf/open/floor/pod/dark,
/area/ship/cargo)
"gI" = (
Expand Down Expand Up @@ -1632,6 +1633,22 @@
/obj/item/bedsheet/medical,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"jO" = (
/obj/structure/table/reinforced,
/obj/item/folder/syndicate/red{
pixel_x = -8;
pixel_y = 6
},
/obj/item/folder/syndicate/blue{
pixel_x = 6;
pixel_y = 4
},
/obj/item/folder/red{
pixel_x = -4
},
/obj/machinery/light/directional/west,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"jT" = (
/obj/structure/sign/syndicate,
/turf/closed/wall/r_wall/syndicate/nodiagonal{
Expand Down Expand Up @@ -1708,15 +1725,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/security)
"kh" = (
/obj/effect/turf_decal/syndicateemblem/middle/middle{
dir = 1
},
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"kl" = (
/obj/machinery/light/directional/north,
/obj/structure/closet/secure_closet{
Expand Down Expand Up @@ -3223,11 +3231,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/atmospherics)
"sV" = (
/obj/item/clothing/suit/space/hardsuit/security/suns,
/obj/machinery/suit_storage_unit/inherit,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"sW" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
Expand Down Expand Up @@ -4555,6 +4558,15 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Bi" = (
/obj/effect/turf_decal/syndicateemblem/middle/middle{
dir = 1
},
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"Bj" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal{
rad_insulation = 0
Expand Down Expand Up @@ -5241,12 +5253,6 @@
/obj/effect/turf_decal/radiation,
/turf/open/floor/engine,
/area/ship/engineering/engine)
"EW" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"EX" = (
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 8
Expand Down Expand Up @@ -5833,19 +5839,8 @@
/turf/open/floor/plasteel/dark,
/area/ship/engineering/atmospherics)
"Hx" = (
/obj/structure/table/reinforced,
/obj/item/folder/syndicate/red{
pixel_x = -8;
pixel_y = 6
},
/obj/item/folder/syndicate/blue{
pixel_x = 6;
pixel_y = 4
},
/obj/item/folder/red{
pixel_x = -4
},
/obj/machinery/light/directional/west,
/obj/structure/table/reinforced,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"HF" = (
Expand Down Expand Up @@ -6567,6 +6562,11 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ship/crew/office)
"Lw" = (
/obj/item/clothing/suit/space/hardsuit/security/suns,
/obj/machinery/suit_storage_unit/inherit,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"LF" = (
/obj/effect/turf_decal/atmos/air{
dir = 8
Expand Down Expand Up @@ -7135,7 +7135,7 @@
dir = 1
},
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
dir = 4
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
Expand Down Expand Up @@ -7939,6 +7939,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/security)
"Tv" = (
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 4
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"TC" = (
/obj/effect/turf_decal/spline/fancy/opaque/syndiered{
dir = 6
Expand Down Expand Up @@ -8825,13 +8831,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"YI" = (
/obj/effect/turf_decal/syndicateemblem/middle/middle,
/obj/effect/turf_decal/spline/fancy/opaque/black{
dir = 8
},
/turf/open/floor/mineral/plastitanium/red,
/area/ship/bridge)
"YJ" = (
/obj/effect/turf_decal/trimline/opaque/syndiered/filled/line,
/obj/machinery/iv_drip,
Expand Down Expand Up @@ -10566,15 +10565,15 @@ wL
nb
Pv
jv
Hx
jO
ox
Xb
vL
cI
bL
aC
Hx
Qt
sV
Lw
nb
MP
Oj
Expand Down Expand Up @@ -10602,14 +10601,14 @@ Gv
RA
nb
lq
YI
EW
br
dL
zy
xg
pI
Zk
bd
PA
Bi
kE
wr
nb
Expand Down Expand Up @@ -10677,13 +10676,13 @@ nb
nb
YW
Tl
kh
PA
OK
FS
kV
mx
WZ
dL
Tv
HL
tZ
nb
Expand Down
15 changes: 7 additions & 8 deletions code/modules/clothing/outfits/factions/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
to_chat(H, "<span class='notice'>You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret!</span>")

/datum/outfit/job/syndicate/bartender/twink
name = "Syndicate - Bartender (Twinkleshine)"
name = "Syndicate - Bartender (Twinkleshine, Donk)"

uniform = /obj/item/clothing/under/syndicate/donk
id = /obj/item/card/id/syndicate_command/crew_id
Expand Down Expand Up @@ -521,7 +521,7 @@
name = "Syndicate - Sergeant (Gorlex)"

/datum/outfit/job/syndicate/hos/twink
name = "Syndicate - Lieutenant (Twinkleshine)"
name = "Syndicate - Lieutenant (Twinkleshine, NGR)"
job_icon = "lieutenant"

uniform = /obj/item/clothing/under/syndicate/aclfgrunt
Expand Down Expand Up @@ -573,7 +573,7 @@
head = /obj/item/clothing/head/HoS/syndicate/suns

/datum/outfit/job/syndicate/hos/suns/twink
name = "Syndicate - Redshield Officer (SUNS)"
name = "Syndicate - Redshield Officer (Twinkleshine, SUNS)"

suit = null
mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
Expand Down Expand Up @@ -668,7 +668,7 @@
suit = /obj/item/clothing/suit/toggle/labcoat/raincoat

/datum/outfit/job/syndicate/paramedic/twink
name = "Syndicate - Medic (Twinkleshine)"
name = "Syndicate - Medic (Twinkleshine, Cybersun)"

mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
uniform = /obj/item/clothing/under/rank/medical/doctor/red
Expand Down Expand Up @@ -893,19 +893,18 @@
ears = /obj/item/radio/headset/alt

/datum/outfit/job/syndicate/miner/twink
name = "Syndicate - Miner (Twinkleshine)"
name = "Syndicate - Miner (Twinkleshine, SUNS)"

uniform = /obj/item/clothing/under/syndicate/coldres
uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit
mask = /obj/item/clothing/mask/gas/syndicate/voicechanger
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/workboots
shoes = /obj/item/clothing/shoes/jackboots/suns
glasses = null
gloves = null
ears = null
r_pocket = null
l_pocket = null
belt = null
implants = list(/obj/item/implant/weapons_auth)

backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
Expand Down

0 comments on commit ea14880

Please sign in to comment.