Skip to content

Commit

Permalink
Refresh: CLIP Part One: Outfits and Clothing (shiptest-ss13#2783)
Browse files Browse the repository at this point in the history
![Screenshot_11203](https://github.com/shiptest-ss13/Shiptest/assets/58402542/e22d3bdc-acb4-488d-bf4c-74da9de8fe7c)

No, she doesn't read your faxes.

Part 1. Adds clothing and outfits. Doesn't add the species variants as i
just want to get this finished my god

Removes the asclepius and corvus. No hard feeling towards the asclepius,
it would break with all the changes and so will the corvus. Except hard
feelings towards corvus.

The guns will be in another PR pending a gun reorganization

Mass renames minutemen, cmm, to CLIP minutemen, CLIP, and similar

Something actually player facing: the camo fatigues and military
webbings have been resprited

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/8f4be9f3-2c75-411b-a30b-7709c751e655)

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/c330609c-a62e-4c27-a37f-7775ecaec526)

![Screenshot_11204](https://github.com/shiptest-ss13/Shiptest/assets/58402542/8d565b17-5de3-4812-a4a1-97dd1e1d6cbd)
:cl: ryerice, meemofcourse
add: redraws military webbing and camo fatigues, gives webbings recolor
options
add: combat boots and gloves have been given happier colors

add: A ton of things related to the confederated league have been
resprited and added
del: Corvus and Asclepius
tweak: CLIP ERTs have been adjusted to be consistent
/:cl:

---------

Signed-off-by: retlaw34 <[email protected]>
Co-authored-by: meem <[email protected]>
  • Loading branch information
2 people authored and MysticalFaceLesS committed Mar 9, 2024
1 parent 5809ccc commit 787d9ab
Show file tree
Hide file tree
Showing 121 changed files with 2,267 additions and 1,367 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1525,8 +1525,8 @@
pixel_x = -7;
pixel_y = 2
},
/obj/item/clothing/under/rank/command/minutemen,
/obj/item/clothing/head/helmet/bulletproof/minutemen,
/obj/item/clothing/under/clip/officer,
/obj/item/clothing/head/helmet/bulletproof/x11/clip,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/wood,
/area/ruin/beach/treasure_cove)
Expand Down
94 changes: 91 additions & 3 deletions _maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,25 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/crew)
"aE" = (
/obj/structure/table/reinforced,
/obj/item/storage/fancy/cigarettes/cigars{
pixel_x = 8
},
/obj/item/lighter{
pixel_x = -11;
pixel_y = 5
},
/obj/item/ammo_box/a762_40/inteq{
pixel_x = 5;
pixel_y = 12
},
/obj/item/reagent_containers/food/drinks/bottle/whiskey{
pixel_x = -7;
pixel_y = 6
},
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"aX" = (
/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
/obj/machinery/door/poddoor{
Expand Down Expand Up @@ -980,6 +999,32 @@
/obj/item/storage/toolbox/ammo/c9mm,
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"va" = (
/obj/structure/closet/secure_closet/wall{
dir = 4;
icon_door = "solgov_wall";
icon_state = "solgov_wall";
name = "vanguard's locker";
pixel_x = -28;
req_access_txt = "58"
},
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/mask/gas/sechailer/balaclava/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/military/assault,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/item/radio/headset/inteq/alt/captain,
/obj/item/areaeditor/shuttle,
/obj/item/shield/riot/tele,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"ve" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/corner/opaque/yellow,
Expand Down Expand Up @@ -1352,6 +1397,49 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/crew)
"Ek" = (
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
},
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm{
pixel_x = -5
},
/obj/item/ammo_box/magazine/co9mm{
pixel_x = 5
},
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm{
pixel_x = -5
},
/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
pixel_y = 5
},
/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
pixel_y = -5
},
/obj/item/ammo_box/magazine/skm_762_40{
pixel_x = -7
},
/obj/item/ammo_box/magazine/skm_762_40{
pixel_x = 7
},
/obj/item/gun/ballistic/automatic/assault/skm/inteq{
pixel_x = -5
},
/obj/structure/closet/secure_closet/wall{
dir = 1;
icon_state = "sec_wall";
name = "weapons lockup";
pixel_y = -28;
req_one_access_txt = "58"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"EC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
Expand Down Expand Up @@ -2807,7 +2895,7 @@ ib
ib
GB
mw
Ix
va
Ki
of
NI
Expand All @@ -2826,9 +2914,9 @@ ib
ib
ib
Yj
Zy
aE
DB
nD
Ek
pe
ne
Pk
Expand Down
Loading

0 comments on commit 787d9ab

Please sign in to comment.