Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh: CLIP Part One: Outfits and Clothing #2783

Merged
merged 39 commits into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b63aece
FUCK this ship, i hope more are cooked up post-refresh
rye-rice Feb 4, 2024
4c7c041
Merge remote-tracking branch 'upstream/master' into re-cmm
rye-rice Feb 8, 2024
0a1acff
repath
rye-rice Feb 11, 2024
81d4613
Merge remote-tracking branch 'upstream/master' into re-cmm
rye-rice Feb 11, 2024
c7a6909
need to pause
rye-rice Feb 11, 2024
e281370
stuff
rye-rice Feb 11, 2024
2fef6d9
Merge remote-tracking branch 'upstream/master' into re-cmm
rye-rice Feb 13, 2024
8002fda
clothinggggggg
rye-rice Feb 18, 2024
463464a
gruh
rye-rice Feb 18, 2024
7dd6b0e
merge
rye-rice Feb 24, 2024
2c4b099
progreesss
rye-rice Feb 24, 2024
853a7b2
poggers, left on at engi outfit
rye-rice Feb 27, 2024
1f280de
wga
rye-rice Feb 29, 2024
8113506
gwa
rye-rice Feb 29, 2024
ac6456b
im lazy
rye-rice Feb 29, 2024
d5d6a2b
awawawa
rye-rice Feb 29, 2024
38573ce
Merge remote-tracking branch 'upstream/master' into re-cmm
rye-rice Feb 29, 2024
0a2b2b5
why the hell is this here
rye-rice Feb 29, 2024
c23f015
gwa
rye-rice Feb 29, 2024
be0cc2d
wa
rye-rice Feb 29, 2024
d81366e
Update code/modules/vending/wardrobes.dm
rye-rice Feb 29, 2024
19122d2
Update code/modules/projectiles/guns/ballistic/smg.dm
rye-rice Feb 29, 2024
497095c
auhg
rye-rice Feb 29, 2024
b6727a5
you should merge this pr without looking (#7)
meemofcourse Mar 1, 2024
43ec2cd
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
rye-rice Mar 1, 2024
13fdacf
Merge branch 'master' into re-cmm
meemofcourse Mar 3, 2024
4dfc879
vela fixes (#8)
meemofcourse Mar 4, 2024
9f11dbe
Merge remote-tracking branch 'upstream/master' into pr/2783
meemofcourse Mar 4, 2024
3792aaf
oops
meemofcourse Mar 4, 2024
fe7d737
Update minutemen_vela.dmm
meemofcourse Mar 4, 2024
75ee1b2
fix linters
meemofcourse Mar 4, 2024
24291fc
kill people with a car covered in hammers that explodes and the hamme…
meemofcourse Mar 4, 2024
389be41
BARD ERT Update
meemofcourse Mar 4, 2024
be5c2b6
oops
meemofcourse Mar 4, 2024
3d295c6
Merge branch 're-cmm' of https://github.com/retlaw34/Shiptest into re…
rye-rice Mar 5, 2024
9294834
forgor 1
rye-rice Mar 5, 2024
d0d6b3c
Merge remote-tracking branch 'upstream/master' into pr/2783
meemofcourse Mar 7, 2024
eaff791
fix conflicts
meemofcourse Mar 7, 2024
569c8b8
Update inteq_vaquero.dmm
meemofcourse Mar 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
50 changes: 0 additions & 50 deletions _maps/configs/minutemen_asclepius.json

This file was deleted.

44 changes: 0 additions & 44 deletions _maps/configs/minutemen_cepheus.json

This file was deleted.

20 changes: 10 additions & 10 deletions _maps/configs/minutemen_vela.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"map_name": "Vela-class Industrial Cruiser",
"prefix": "CMGSV",
"namelists": ["GENERAL", "MYTHOLOGICAL", "BEASTS"],
"description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the Colonial Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.",
"description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the CLIP Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.",
"tags": [
"Robotics",
"Construction",
Expand All @@ -15,41 +15,41 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/minutemen/captain",
"outfit": "/datum/outfit/job/clip/captain",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/minutemen/ce",
"outfit": "/datum/outfit/job/clip/ce",
"officer": true,
"slots": 1
},
"Bridge Officer": {
"outfit": "/datum/outfit/job/minutemen/head_of_personnel",
"outfit": "/datum/outfit/job/clip/head_of_personnel",
"slots": 1
},
"Mech Pilot": {
"outfit": "/datum/outfit/job/minutemen/miner",
"outfit": "/datum/outfit/job/clip/minutemen/vehicle_pilot",
"slots": 4
},
"Mech Technician": {
"outfit": "/datum/outfit/job/minutemen/roboticist",
"outfit": "/datum/outfit/job/clip/minutemen/vehicle_crew",
"slots": 2
},
"Engineer": {
"outfit": "/datum/outfit/job/minutemen/engineer",
"outfit": "/datum/outfit/job/clip/mechanic",
"slots": 2
},
"Minuteman": {
"outfit": "/datum/outfit/job/minutemen/security",
"outfit": "/datum/outfit/job/clip/minutemen/grunt",
"slots": 2
},
"Scientist": {
"outfit": "/datum/outfit/job/minutemen/scientist",
"outfit": "/datum/outfit/job/clip/scientist",
"slots": 2
},
"Cadet": {
"outfit": "/datum/outfit/job/minutemen/assistant",
"outfit": "/datum/outfit/job/clip/assistant",
"slots": 1
}
},
Expand Down
Loading
Loading