Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
23da0e7
Automatic changelog compile [ci skip]
actions-user Apr 5, 2026
3b4b8d5
Darkens Makosso-Warra Colours (#6110)
generalthrax Apr 5, 2026
6ec403e
Automatic changelog generation for PR #6110 [ci skip]
actions-user Apr 5, 2026
783acb2
Adds factional webbings to cargo (#5968)
zimon9 Apr 6, 2026
f069b82
obliterates valentine's day from the code (#5888)
Addust Apr 6, 2026
da7bfbf
Automatic changelog generation for PR #5888 [ci skip]
actions-user Apr 6, 2026
d032cbe
More Chemistry / Hydroponics stuff in cargo (#5946)
Erikafox Apr 6, 2026
7999625
Automatic changelog generation for PR #5946 [ci skip]
actions-user Apr 6, 2026
1bfb4f3
Automatic changelog compile [ci skip]
actions-user Apr 6, 2026
2ffe8f3
Puru-Rangi auxiliary NGR vessel (#5926)
Samsterious Apr 7, 2026
c4e8e57
Automatic changelog generation for PR #5926 [ci skip]
actions-user Apr 7, 2026
3defb70
Reworks pancrazine (#6102)
googobbug Apr 7, 2026
09ba36e
Hail optimizations (#6090)
Gristlebee Apr 7, 2026
f2def0c
Removes Hunter's Pride engraving from the improvised shotgun (#6109)
googobbug Apr 7, 2026
9acf95e
Reduces the layer of a subset of atmospherics machines so that they l…
zimon9 Apr 7, 2026
297f984
Automatic changelog generation for PR #6102 [ci skip]
actions-user Apr 7, 2026
c07756e
Megafauna no longer gib by default (#6134)
Gristlebee Apr 7, 2026
78ae5b7
Automatic changelog generation for PR #6047 [ci skip]
actions-user Apr 8, 2026
2cc68eb
Leyak Housekeeping (#6068)
thearbiber Apr 8, 2026
3c4ae9a
Automatic changelog generation for PR #6068 [ci skip]
actions-user Apr 8, 2026
9dca8b4
Automatic changelog compile [ci skip]
actions-user Apr 8, 2026
6ec22fe
short half ups and ponytail spiky adjustment (#6140)
thearbiber Apr 8, 2026
312bb11
CLIP industrial hardsuit (#6127)
thearbiber Apr 8, 2026
97b691a
Weapon Cell Price Revisit (#6138)
DIB-DOG Apr 8, 2026
2311f42
Automatic changelog generation for PR #6138 [ci skip]
actions-user Apr 8, 2026
05ad60a
Reduces prices of jetpacks (#6123)
firebudgy Apr 8, 2026
a9644eb
Adds brass knuckles so you can pay off your debt to the tooth fairy. …
stiel0248 Apr 8, 2026
c2d38fb
Automatic changelog generation for PR #6116 [ci skip]
actions-user Apr 8, 2026
785fbc8
zipper (#6142)
Erikafox Apr 8, 2026
4bc8ee8
Automatic changelog generation for PR #6142 [ci skip]
actions-user Apr 8, 2026
691f0d1
whitereds back in cargo (#6144)
thearbiber Apr 9, 2026
50db51e
Automatic changelog generation for PR #6144 [ci skip]
actions-user Apr 9, 2026
c44bdbe
Automatic changelog compile [ci skip]
actions-user Apr 9, 2026
7c57045
IPC refactor part 2: maybe kinda sane edition (#5939)
iamthesilly Apr 9, 2026
eb2b4e5
Automatic changelog generation for PR #5939 [ci skip]
actions-user Apr 9, 2026
cdb38c1
Automatic changelog compile [ci skip]
actions-user Apr 10, 2026
b33af56
Shields now only reflect from the direction the user's facing (#5983)
Erikafox Apr 10, 2026
144dd90
Automatic changelog generation for PR #5983 [ci skip]
actions-user Apr 10, 2026
75f5c69
Cargo Specialty Shells (#6067)
generalthrax Apr 10, 2026
abe6a7a
Automatic changelog generation for PR #6067 [ci skip]
actions-user Apr 10, 2026
b495e0f
Automatic changelog compile [ci skip]
actions-user Apr 11, 2026
8e4b45f
Remove Mentors and all related systems (#6085)
generalthrax Apr 12, 2026
1c7f29c
Automatic changelog generation for PR #6085 [ci skip]
actions-user Apr 12, 2026
3ce1e3e
Automatic changelog compile [ci skip]
actions-user Apr 13, 2026
4534dc4
NGR mining hardsuit (#6147)
thearbiber Apr 14, 2026
a4b8969
Automatic changelog generation for PR #6147 [ci skip]
actions-user Apr 14, 2026
a0a513a
Automatic changelog compile [ci skip]
actions-user Apr 15, 2026
a973231
digi utility jumpsuit sprite (#6166)
thearbiber Apr 15, 2026
b48d3ec
Fixed more typos (#6162)
AnomalousPotato Apr 15, 2026
2fa9b74
Automatic changelog generation for PR #6166 [ci skip]
actions-user Apr 15, 2026
0e3f349
Skirt colors + bar waistcoat (#6164)
thearbiber Apr 15, 2026
be1612f
makes Hivebots less cracked (#6150)
PhoenixTheRedandEvil Apr 15, 2026
f93fef9
Automatic changelog generation for PR #6164 [ci skip]
actions-user Apr 15, 2026
9302a9d
beef jerky (#6165)
thearbiber Apr 15, 2026
1ad93e6
Automatic changelog generation for PR #6165 [ci skip]
actions-user Apr 15, 2026
15466a7
Vox Frontiersman Update (#6163)
firebudgy Apr 15, 2026
8d57db9
Automatic changelog generation for PR #6150 [ci skip]
actions-user Apr 15, 2026
b55a220
Explosion Damage Granularity (#6017)
Gristlebee Apr 15, 2026
3b965ad
Automatic changelog generation for PR #6017 [ci skip]
actions-user Apr 15, 2026
6a12217
Fixes OOC (#6168)
generalthrax Apr 15, 2026
655541e
Automatic changelog generation for PR #6168 [ci skip]
actions-user Apr 15, 2026
420f8dd
Automatic changelog compile [ci skip]
actions-user Apr 16, 2026
85d914b
Rename human skin tones, add 10 new options (#6119)
Retrino Apr 16, 2026
ebf8de6
The fog is coming to Thousand Eyed Perch (#6077)
Erikafox Apr 16, 2026
735050f
Automatic changelog generation for PR #6077 [ci skip]
actions-user Apr 16, 2026
1ef5c0c
Automatic changelog compile [ci skip]
actions-user Apr 17, 2026
1ed5aaa
Adds Cryo Console to Puru Rangi (#6180)
generalthrax Apr 18, 2026
33656ca
Merge remote-tracking branch 'upstream/master' into upstream-20260419…
blinkdog Apr 19, 2026
50c6a20
Fix include ordering in shiptest.dme
blinkdog Apr 19, 2026
79513f5
Modernize Sinta'Unathi
blinkdog Apr 19, 2026
ff5c733
Re-add independent_shetland.dm to shiptest.dme
blinkdog Apr 19, 2026
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: 0 additions & 4 deletions _maps/RandomRuins/IceRuins/icemoon_training_center.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,6 @@
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 6
},
/obj/item/valentine{
pixel_x = -2;
pixel_y = 10
},
/obj/item/clothing/neck/tie/gay{
pixel_x = 8;
pixel_y = 15
Expand Down
9 changes: 3 additions & 6 deletions _maps/configs/hardliners_leyak.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"map_path": "_maps/shuttles/hardliner/hardliners_leyak.dmm",
"map_id": "hardliners_leyak",
"limit": 1,
"tranist_y_offset": -11,
"starting_funds": 1500,
"job_slots": {
"Captain": {
Expand All @@ -35,25 +36,21 @@
"officer": true,
"slots": 1
},
"Medical Doctor": {
"Field Medic": {
"outfit": "/datum/outfit/job/syndicate/doctor/gorlex",
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/syndicate/engineer/gorlex",
"slots": 1
},
"Wrecker": {
"outfit": "/datum/outfit/job/syndicate/miner/gorlex",
"slots":1
},
"Trooper": {
"outfit": "/datum/outfit/job/syndicate/security/gorlex",
"slots": 2
},
"Junior Agent": {
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
"slots": 2
"slots": 1
}
},
"enabled": true
Expand Down
62 changes: 62 additions & 0 deletions _maps/configs/ngr_pururangi.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"faction": "/datum/faction/syndicate/ngr",
"prefix": "NGRV",
"manufacturer": "Hardline Salvage and Mining",
"namelists": [
"GORLEX",
"NATURAL",
"BEASTS",
"CRUISE"
],
"map_name": "Puru-Rangi-class Auxiliary Response Vessel",
"map_short_name": "Puru-Rangi-class",
"tranist_x_offset": -21,
"tranist_y_offset": -11,
"description": "While destroyers and patrol craft maintain the Republic's borders, it is the Puru-Rangi that ensures that there are not unprotected gaps in its territory. These response vessels are a common sight within the Second Battlegroup's auxiliary fleet, providing a versatile complement of personnel for disaster response and military escort. While their relative size renders them impractical to manufacture on a large scale, their communications equipment and diverse crew are valuable assets for coordinating and leading quick response forces staged in the backline.",
"tags": [
"RP Focus",
"Combat",
"Medical",
"Telecomms"
],
"map_path": "_maps/shuttles/ngr/ngr_pururangi.dmm",
"map_id": "syndicate_gorlex_pururangi",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/ngr/stripped",
"officer": true,
"slots": 1
},
"Lieutenant": {
"outfit": "/datum/outfit/job/syndicate/hos/ngr/stripped",
"officer": true,
"slots": 1
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/syndicate/doctor/ngr/stripped",
"slots": 1
},
"Field Medic": {
"outfit": "/datum/outfit/job/syndicate/paramedic/ngr/stripped",
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/syndicate/engineer/ngr/stripped",
"slots": 1
},
"Operative": {
"outfit": "/datum/outfit/job/syndicate/security/ngr",
"slots": 1
},
"Wrecker": {
"outfit": "/datum/outfit/job/syndicate/miner/ngr",
"slots": 1
},
"Crewman": {
"outfit": "/datum/outfit/job/syndicate/assistant/ngr",
"slots": 1
}
},
"enabled": true
}
4 changes: 0 additions & 4 deletions _maps/outpost/cybersun_gas_giant.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15387,10 +15387,6 @@
},
/obj/effect/turf_decal/industrial/hatch,
/obj/structure/closet/crate/trashcart,
/obj/item/valentine{
pixel_x = -4;
pixel_y = -1
},
/obj/item/trash/waffles{
pixel_x = 3;
pixel_y = 7
Expand Down
Loading
Loading