Skip to content

Commit

Permalink
Чиним-чиним, названия меняем
Browse files Browse the repository at this point in the history
  • Loading branch information
@Burbonchik
Burbonchik committed Dec 28, 2024
1 parent 7eaac42 commit 708971d
Show file tree
Hide file tree
Showing 2 changed files with 202 additions and 50 deletions.
0 ...celadon/configs/syndicate_ngr_bettle.json → ...adon/configs/syndicate_gorlex_bettle.json
View file
File renamed without changes.
252 changes: 202 additions & 50 deletions ...uttles/syndicate/syndicate_ngr_bettle.dmm → ...les/syndicate/syndicate_gorlex_bettle.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,11 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/obj/item/tank/jetpack/oxygen/harness,
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down Expand Up @@ -416,9 +421,12 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/suit/space/syndicate/black/engie,
/obj/item/clothing/shoes/magboots/syndie,
/obj/item/clothing/head/helmet/space/syndicate/black/engie,
/obj/item/tank/jetpack/oxygen,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down Expand Up @@ -609,12 +617,30 @@
/obj/structure/closet/wall{
pixel_y = -28
},
/obj/item/clothing/under/syndicate/ngr/fatigues,
/obj/item/clothing/under/syndicate/ngr/fatigues,
/obj/item/clothing/under/syndicate/ngr/fatigues,
/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/fatigues{
desc = "Beige fatigues used primarily by the shuttle and exosuit pilots of the Gorlex.";
name = "\improper Gorlex fatigues"
},
/obj/item/clothing/under/syndicate/ngr/fatigues{
desc = "Beige fatigues used primarily by the shuttle and exosuit pilots of the Gorlex.";
name = "\improper Gorlex fatigues"
},
/obj/item/clothing/under/syndicate/ngr/fatigues{
desc = "Beige fatigues used primarily by the shuttle and exosuit pilots of the Gorlex.";
name = "\improper Gorlex fatigues"
},
/obj/item/clothing/under/syndicate/ngr/jumpsuit{
name = "\improper Gorlex jumpsuit";
desc = "A beige jumpsuit with black overalls used by wreckers of the Gorlex. A reminder of Gorlex VII's history as a mining colony, prior to its destruction."
},
/obj/item/clothing/under/syndicate/ngr/jumpsuit{
name = "\improper Gorlex jumpsuit";
desc = "A beige jumpsuit with black overalls used by wreckers of the Gorlex. A reminder of Gorlex VII's history as a mining colony, prior to its destruction."
},
/obj/item/clothing/under/syndicate/ngr/jumpsuit{
name = "\improper Gorlex jumpsuit";
desc = "A beige jumpsuit with black overalls used by wreckers of the Gorlex. A reminder of Gorlex VII's history as a mining colony, prior to its destruction."
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
Expand Down Expand Up @@ -688,6 +714,11 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/obj/item/tank/jetpack/oxygen/harness,
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down Expand Up @@ -740,20 +771,39 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/west,
/obj/item/clothing/head/helmet/ngr/swat,
/obj/item/clothing/head/ngr/peaked,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/head/helmet/ngr/swat{
desc = "A modified X-11 helmet utilized by the pilots of the Gorlex's 2nd Battlegroup. The attached visor helps protect against sudden flashes from explosions.";
name = "\improper Gorlex pilot helmet"
},
/obj/item/clothing/head/ngr/peaked{
desc = "A cap worn by officers of the Gorlex's 2nd Battlegroup."
},
/obj/item/clothing/suit/armor/ngr/captain{
desc = "An armored coat worn by captains the Gorlex's 2nd Battlegroup."
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/under/syndicate/ngr/officer{
desc = "A button-up in a tasteful black with beige pants, used by officers of the Gorlex.";
name = "\improper Gorlex officer uniform"
},
/obj/item/clothing/glasses/thermal/xray,
/obj/item/clothing/suit/armor/ngr,
/obj/item/clothing/suit/armor/ngr{
desc = "A slim Type I armored vest, utilized by the 2nd Battlegroup of the Gorlex that provides decent protection against most types of damage.";
name = "Gorlex armor vest"
},
/obj/item/tank/jetpack/suit,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/item/melee/classic_baton/telescopic,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/under/syndicate/ngr/fatigues,
/obj/item/clothing/under/syndicate/ngr/fatigues{
name = "\improper Gorlex fatigues";
desc = "Beige fatigues used primarily by the shuttle and exosuit pilots of the Gorlex."
},
/obj/item/radio/headset/syndicate/alt/captain,
/obj/item/storage/belt/security/webbing/ngr,
/obj/item/storage/belt/security/webbing/ngr{
desc = "A set of tactical webbing for operators of the Gorlex, can hold security gear.";
name = "Gorlex webbing"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
Expand Down Expand Up @@ -956,7 +1006,6 @@
/turf/open/floor/plating,
/area/ship/engineering)
"qm" = (
/obj/structure/closet/crate/secure/loot,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
Expand Down Expand Up @@ -1269,6 +1318,11 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/south,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/obj/item/tank/jetpack/oxygen/harness,
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand All @@ -1288,27 +1342,64 @@
populate = 0
},
/obj/effect/turf_decal/box,
/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
/obj/item/clothing/suit/hooded/wintercoat/security/ngr,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr,
/obj/item/clothing/head/ngr/flap,
/obj/item/clothing/head/ngr/flap,
/obj/item/clothing/head/ngr,
/obj/item/clothing/head/ngr,
/obj/item/clothing/suit/hooded/wintercoat/security/ngr{
name = "Gorlex winter coat";
desc = "A sleek beige winter coat used by the Second Battlegroup of the Gorlex, the zipper tab proudly displays the official emblem of the Gorlex."
},
/obj/item/clothing/suit/hooded/wintercoat/security/ngr{
name = "Gorlex winter coat";
desc = "A sleek beige winter coat used by the Second Battlegroup of the Gorlex, the zipper tab proudly displays the official emblem of the Gorlex."
},
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/obj/item/clothing/head/ngr/flap{
desc = "A flap cap used by soldiers of the Gorlex's 2nd Battlegroup in desert environments."
},
/obj/item/clothing/head/ngr/flap{
desc = "A flap cap used by soldiers of the Gorlex's 2nd Battlegroup in desert environments."
},
/obj/item/clothing/head/ngr{
desc = "A garrison cap used by low-ranking members of the Gorlex's 2nd Battlegroup when off-duty."
},
/obj/item/clothing/head/ngr{
desc = "A garrison cap used by low-ranking members of the Gorlex's 2nd Battlegroup when off-duty."
},
/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/mask/gas/syndicate/ngr,
/obj/item/clothing/mask/gas/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/mask/gas/syndicate/ngr{
name = "Gorlex face mask"
},
/obj/item/clothing/mask/gas/syndicate/ngr{
name = "Gorlex face mask"
},
/obj/item/clothing/under/syndicate/ngr{
desc = "A button-up in a tasteful beige with black pants, used as the basic uniform of the Gorlex.";
name = "\improper Gorlex uniform"
},
/obj/item/clothing/under/syndicate/ngr{
desc = "A button-up in a tasteful beige with black pants, used as the basic uniform of the Gorlex.";
name = "\improper Gorlex uniform"
},
/obj/item/clothing/under/syndicate/ngr{
desc = "A button-up in a tasteful beige with black pants, used as the basic uniform of the Gorlex.";
name = "\improper Gorlex uniform"
},
/obj/effect/turf_decal/spline/fancy/transparent/syndiered{
dir = 5
},
/obj/machinery/light/directional/north,
/obj/item/clothing/suit/hooded/wintercoat/security/ngr{
name = "Gorlex winter coat";
desc = "A sleek beige winter coat used by the Second Battlegroup of the Gorlex, the zipper tab proudly displays the official emblem of the Gorlex."
},
/turf/open/floor/plasteel/mono/white{
color = "#CEB689"
},
Expand Down Expand Up @@ -1348,21 +1439,54 @@
name = "armor locker";
req_one_access_txt = "1"
},
/obj/item/clothing/head/helmet/ngr,
/obj/item/clothing/head/helmet/ngr,
/obj/item/clothing/head/helmet/ngr,
/obj/item/clothing/suit/armor/ngr,
/obj/item/clothing/suit/armor/ngr,
/obj/item/clothing/suit/armor/ngr,
/obj/item/clothing/suit/armor/ngr{
desc = "A slim Type I armored vest, utilized by the 2nd Battlegroup of the Gorlex that provides decent protection against most types of damage.";
name = "Gorlex armor vest"
},
/obj/item/clothing/suit/armor/ngr{
name = "Gorlex armor vest";
desc = "A slim Type I armored vest, utilized by the 2nd Battlegroup of the Gorlex that provides decent protection against most types of damage."
},
/obj/item/clothing/suit/armor/ngr{
desc = "A slim Type I armored vest, utilized by the 2nd Battlegroup of the Gorlex that provides decent protection against most types of damage.";
name = "Gorlex armor vest"
},
/obj/item/clothing/gloves/combat,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/gloves/combat,
/obj/item/storage/belt/security/webbing/ngr,
/obj/item/storage/belt/security/webbing/ngr,
/obj/item/storage/belt/security/webbing/ngr,
/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
/obj/item/storage/belt/security/webbing/ngr{
desc = "A set of tactical webbing for operators of the Gorlex, can hold security gear.";
name = "Gorlex webbing"
},
/obj/item/storage/belt/security/webbing/ngr{
desc = "A set of tactical webbing for operators of the Gorlex, can hold security gear.";
name = "Gorlex webbing"
},
/obj/item/storage/belt/security/webbing/ngr{
desc = "A set of tactical webbing for operators of the Gorlex, can hold security gear.";
name = "Gorlex webbing"
},
/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
name = "Gorlex modified mesons"
},
/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
name = "Gorlex modified mesons"
},
/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
name = "Gorlex modified mesons"
},
/obj/item/clothing/head/helmet/ngr{
name = "\improper Gorlex X-11 helmet";
desc = "A well-armored helmet utilized by the Gorlex's 2nd Battlegroup, far better at protecting one's head than the softer caps."
},
/obj/item/clothing/head/helmet/ngr{
name = "\improper Gorlex X-11 helmet";
desc = "A well-armored helmet utilized by the Gorlex's 2nd Battlegroup, far better at protecting one's head than the softer caps."
},
/obj/item/clothing/head/helmet/ngr{
name = "\improper Gorlex X-11 helmet";
desc = "A well-armored helmet utilized by the Gorlex's 2nd Battlegroup, far better at protecting one's head than the softer caps."
},
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down Expand Up @@ -1513,7 +1637,6 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/weightmachine/weightlifter,
/obj/machinery/button/door{
id = "Bettle_Cargo";
name = "cargo shutters";
Expand All @@ -1525,6 +1648,7 @@
pixel_x = 7;
pixel_y = 21
},
/obj/structure/weightmachine/weightlifter,
/turf/open/floor/plasteel/strongdark,
/area/ship/cargo)
"xu" = (
Expand Down Expand Up @@ -2101,6 +2225,11 @@
pixel_y = 28
},
/obj/machinery/airalarm/directional/west,
/obj/item/tank/jetpack/oxygen/harness,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down Expand Up @@ -2769,11 +2898,23 @@
populate = 0
},
/obj/machinery/light/small/directional/east,
/obj/item/clothing/suit/hazardvest/ngr,
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr,
/obj/item/clothing/under/syndicate/ngr/jumpsuit,
/obj/item/clothing/glasses/hud/security/sunglasses/ngr,
/obj/item/clothing/head/hardhat/ngr,
/obj/item/clothing/suit/hazardvest/ngr{
desc = "A blood-red high-visibility vest typically used in work zones by the Gorlex."
},
/obj/item/clothing/mask/gas/sechailer/balaclava/ngr{
desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the Gorlex to protect against sandstorms.";
name = "Gorlex combat balaclava"
},
/obj/item/clothing/under/syndicate/ngr/jumpsuit{
name = "\improper Gorlex jumpsuit";
desc = "A beige jumpsuit with black overalls used by wreckers of the Gorlex. A reminder of Gorlex VII's history as a mining colony, prior to its destruction."
},
/obj/item/clothing/glasses/hud/security/sunglasses/ngr{
name = "Gorlex modified mesons"
},
/obj/item/clothing/head/hardhat/ngr{
desc = "A blood-red hardhat typically used by Wreckers and Ship Engineers of the Gorlex."
},
/obj/item/clothing/gloves/color/red/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/gorlex,
Expand All @@ -2784,6 +2925,7 @@
/obj/item/spacecash/bundle/c200,
/obj/item/spacecash/bundle/c50,
/obj/item/gun/energy/e_gun/e11,
/obj/item/clothing/shoes/magboots/syndie,
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down Expand Up @@ -2989,16 +3131,23 @@
/obj/machinery/light/small/directional/west,
/obj/item/gun/energy/kalix/pistol,
/obj/item/stock_parts/cell/gun/kalix,
/obj/item/clothing/suit/ngr/smock,
/obj/item/clothing/head/ngr/surgical,
/obj/item/clothing/suit/ngr/smock{
desc = "A blood-red surgical smock typically worn by field medics of the Gorlex. It hides red blood really well!"
},
/obj/item/clothing/head/ngr/surgical{
desc = "A surgical cap used by field medics of the Gorlex's 2nd Battlegroup."
},
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/syndicate/ngr/fatigues,
/obj/item/clothing/under/syndicate/ngr/fatigues{
desc = "Beige fatigues used primarily by the shuttle and exosuit pilots of the Gorlex.";
name = "\improper Gorlex fatigues"
},
/obj/item/clothing/gloves/color/latex/nitrile/evil,
/obj/item/clothing/head/helmet/medical{
name = "improper trauma team helmet"
},
/obj/item/clothing/suit/armor/vest/trauma{
name = "Gorlex armor vest"
name = "Gorlex trauma team armor vest"
},
/obj/item/storage/belt/medical/webbing/paramedic,
/obj/item/clothing/accessory/holster,
Expand All @@ -3013,6 +3162,9 @@
/obj/item/storage/backpack/satchel/med,
/obj/item/spacecash/bundle/c200,
/obj/item/spacecash/bundle/c50,
/obj/item/clothing/mask/gas/syndicate/ngr{
name = "Gorlex face mask"
},
/turf/open/floor/plasteel/patterned/grid{
color = "#777777"
},
Expand Down

0 comments on commit 708971d

Please sign in to comment.