Skip to content

UPDATE-SYNC: ОБНОВЛЕНИЕ с АПСТРИМОМ #26 #2868

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.

Sign up for GitHub

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

Merged
MysticalFaceLesS merged 55 commits into from
Jun 13, 2026
Merged

UPDATE-SYNC: ОБНОВЛЕНИЕ с АПСТРИМОМ #26 #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
449cef1
League Zohilian (#5608)
meemofcourse Feb 20, 2026
9b259b0
Returns Zohilan as a selectable language (#5912)
iamthesilly Feb 20, 2026
cb2f80a
Fixes cloak discount (#5914)
iamthesilly Feb 21, 2026
a0b9a3a
Update pavement name and description (#5923)
OnlineGirlfriend Feb 23, 2026
edacd07
fixes some trifuge maint walls (#5916)
Erikafox Feb 23, 2026
e570b40
Various Overmap Fixes and QOL (#5887)
rye-rice Feb 24, 2026
d24e8c2
Fixes language preferences (#5922)
iamthesilly Feb 24, 2026
0253607
Extremely Minor Nimbus / Cirrus changes (#5921)
generalthrax Feb 24, 2026
f209f28
replaces a missing console on the kiwi (#5929)
moffball19 Feb 25, 2026
bab6a50
Removes Phobia Quirk (#5896)
generalthrax Feb 25, 2026
59ef0cb
Tweak Woeful Cthonian description (#5931)
OnlineGirlfriend Feb 25, 2026
bf95076
Proper outpost baseturfs (#5936)
rye-rice Feb 27, 2026
68e306f
Adds missing directionals for SUNS bedsheet (#5930)
OnlineGirlfriend Feb 27, 2026
13162d5
Spellcheck drink_reagents.dm (#5932)
OnlineGirlfriend Feb 27, 2026
a54fc6c
Spellchecks black market weapons (#5933)
OnlineGirlfriend Feb 28, 2026
0565970
Make baked potatoes classify as their actual ingredients (#5915)
Retrino Feb 28, 2026
6ebdbc5
Armored Grey Spacesuit reskin no longer makes you naked (#5905)
DIB-DOG Feb 28, 2026
5499bb7
Etherbor Weapon Amends (#5875)
DIB-DOG Feb 28, 2026
bea5007
Swaps the glove type for the Derecho Foreman (#5942)
zimon9 Feb 28, 2026
ba17cae
Halves the Model H's recoil (#5911)
generalthrax Feb 28, 2026
7540ecd
Brings Bear Speed down to Polar Bear Speed (#5909)
generalthrax Feb 28, 2026
1d636be
Minor Shrike changes (#5925)
Burning02 Mar 1, 2026
c7f3f47
remove deepthroat (#5955)
firebudgy Mar 4, 2026
4d376fe
Directional Attacks will refrain from self-targetting (#5853)
Erikafox Mar 4, 2026
acbae6f
refactor prosthetic limbs (#5641)
Erikafox Feb 10, 2026
610d9d7
Robot Wounds (#5676)
iamthesilly Feb 1, 2026
deca665
FIX: Robot Wounds
MysticalFaceLesS Jun 7, 2026
ef6576e
Eye wounds + new quirk (#5897)
MysticalFaceLesS Jun 7, 2026
dab3bdb
Jungleworld Greebles (#5807)
Erikafox Mar 4, 2026
5f0ebc9
Inteq Docking Port Adjustments (#5953)
moffball19 Mar 4, 2026
d57d6ab
Removes addictions (#5713)
Erikafox Mar 4, 2026
c04f0c8
The Closetening: Two Years In the Making (#5904)
Imaginos16 Mar 5, 2026
7cb9cd8
Ice Lodge Touch Ups and mine initialization changes (#5947)
Gristlebee Mar 5, 2026
bc80d18
Destroys the /syndicate map folder (#5781)
Erikafox Mar 5, 2026
9c9263d
Lets Miras Egg be dried (#5966)
generalthrax Mar 6, 2026
1c78370
Adds an icon for Gezenan (#5898)
meemofcourse Mar 6, 2026
72995c9
Vox DLC: Unrestricted Nuclear Warfare Edition (#5954)
firebudgy Mar 6, 2026
5e33621
Overcoats & Hats + Loadout Accessories (#5952)
moffball19 Mar 6, 2026
e5703ab
Imaginos's Cybersun Sprites + Code Organization (#5937)
Erikafox Mar 6, 2026
1e7bb38
Fixes muscle wounds being applied to the chest and head (#5950)
iamthesilly Mar 6, 2026
21a9880
Compile warning fix (#5956)
iamthesilly Mar 6, 2026
dee31ec
Removes lawnmower from Serene Hunts (#5949)
Gristlebee Mar 6, 2026
7fe50cf
Fixes Messy Chop Haircut (#5972)
Imaginos16 Mar 6, 2026
76913f0
Reverts undocumented armor changes (#5969)
firebudgy Mar 6, 2026
e03d699
Makes the Himehabu tiny (#5975)
rye-rice Mar 7, 2026
bd0775a
Buffs the Neutron Hardsuit alittle (#5918)
rye-rice Mar 7, 2026
fbc335e
fix the venetia double dock (#5981)
Erikafox Mar 8, 2026
28d5e83
Minor Cybersun armor fixes (#5985)
Overteh Mar 10, 2026
5c51437
fix t4 drill readout (#5977)
Erikafox Mar 10, 2026
add9392
Planet Names can only be picked once in a round (#5973)
Erikafox Mar 10, 2026
a886798
Fixes coffee cup reagent fill state (#5986)
firebudgy Mar 10, 2026
b4ea44d
Abandoned Crate Fix (#5989)
firebudgy Mar 10, 2026
cecef4a
Fixes neck slice (#5935)
iamthesilly Feb 28, 2026
43acc52
FIX: Repair maps
MysticalFaceLesS Jun 7, 2026
9aca4e7
FIX: Repair Map - Cybersun Cirrus
MysticalFaceLesS Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,8 +1224,8 @@
name = "Cybersun Brand Jorts";
desc = "'The days of spring will surely bring the birds and bees cavorting. But since I am a Syndicate, I'd much rather be jorting' -CEO of Cybersun"
},
/obj/item/clothing/under/syndicate/cybersun,
/obj/item/clothing/under/syndicate/cybersun,
/obj/item/clothing/under/cybersun,
/obj/item/clothing/under/cybersun,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
Expand Down
12 changes: 8 additions & 4 deletions _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
/obj/machinery/door/airlock/wood{
dir = 4
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/welded,
/turf/open/floor/wood/mahogany,
/area/ruin/powered/icemoon/lodge/cellar)
"mc" = (
Expand Down Expand Up @@ -875,7 +875,6 @@
/area/ruin/powered/icemoon/lodge/residential)
"no" = (
/obj/structure/table/wood,
/obj/machinery/fax/ruin,
/turf/open/floor/carpet/red_gold,
/area/ruin/powered/icemoon/lodge/montagne_office)
"nD" = (
Expand Down Expand Up @@ -2855,7 +2854,7 @@
/obj/machinery/door/airlock/wood{
dir = 4
},
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/welded,
/turf/open/floor/wood/mahogany,
/area/ruin/powered/icemoon/lodge/cellar)
"RM" = (
Expand Down Expand Up @@ -2907,6 +2906,10 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/obj/item/extinguisher/mini{
pixel_x = -10;
pixel_y = 13
},
/turf/open/floor/wood/maple,
/area/ruin/powered/icemoon/lodge/residential)
"Td" = (
Expand Down Expand Up @@ -3280,7 +3283,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/mine/proximity/explosive/live{
range_heavy = 1;
range_light = 5
range_light = 5;
spawn_arm_delay = 100
},
/obj/effect/mob_spawn/human/corpse/srm/montagne,
/turf/open/floor/wood/maple,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,15 +1616,15 @@
/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/line{
dir = 1
},
/obj/item/clothing/under/syndicate/cybersun/officer,
/obj/item/clothing/under/cybersun/officer,
/obj/structure/closet/secure_closet{
anchored = 1;
icon_state = "hos";
name = "Cybersun Locker";
req_access = list(150, 20);
populate = 0
},
/obj/item/clothing/suit/cybersun_suit,
/obj/item/clothing/suit/cybersun,
/obj/item/clothing/head/soft/cybersun,
/obj/item/clothing/gloves/combat,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -8600,7 +8600,7 @@
populate = 0
},
/obj/item/defibrillator,
/obj/item/clothing/under/syndicate/medic,
/obj/item/clothing/under/cybersun/medic,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/soft/cybersun/medical,
/obj/item/clothing/suit/toggle/labcoat/raincoat,
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10368,7 +10368,6 @@ Ox
Ox
kq
Al
sc
"}
(50,1,1) = {"
sc
Expand Down
13 changes: 4 additions & 9 deletions _maps/RandomRuins/JungleRuins/jungle_serene_hunts.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4600,11 +4600,6 @@
/obj/effect/turf_decal/siding/white/corner,
/turf/open/floor/concrete/pavement/jungleplanet/lit,
/area/overmap_encounter/planetoid/jungle/explored)
"Mi" = (
/obj/structure/spacevine,
/obj/vehicle/ridden/lawnmower,
/turf/open/floor/wood/jungleplanet,
/area/overmap_encounter/planetoid/jungle/explored)
"Mj" = (
/obj/structure/flora/rock/jungle,
/turf/open/floor/plating/asteroid/dirt/jungle/dark,
Expand Down Expand Up @@ -4981,7 +4976,7 @@
/obj/structure/sign/painting/library{
pixel_y = 29
},
/obj/item/clothing/head/HoS/cybersun,
/obj/item/clothing/head/cybersun,
/turf/open/floor/carpet/red/jungleplanet,
/area/ruin/powered/hunts/hotel)
"PP" = (
Expand Down Expand Up @@ -5847,11 +5842,11 @@
dir = 10
},
/obj/item/clothing/under/misc/pj/blue,
/obj/item/clothing/suit/cybersun_suit{
/obj/item/clothing/suit/cybersun{
pixel_x = 7;
pixel_y = -3
},
/obj/item/clothing/under/syndicate/cybersun/officer{
/obj/item/clothing/under/cybersun/officer{
pixel_y = -7;
pixel_x = -5
},
Expand Down Expand Up @@ -8319,7 +8314,7 @@ hM
ye
hM
ZS
Mi
hM
lL
TN
Va
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2318,7 +2318,7 @@
dir = 6
},
/obj/item/clothing/head/soft/cybersun,
/obj/item/clothing/suit/cybersun_suit,
/obj/item/clothing/suit/cybersun,
/turf/open/floor/carpet/nanoweave/red,
/area/ruin/unpowered/listening_post/commons)
"Ut" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
pixel_x = -7;
pixel_y = 5
},
/obj/item/clothing/head/HoS/cybersun{
/obj/item/clothing/head/cybersun{
pixel_x = 7;
pixel_y = 7
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SandRuins/whitesands_nomads_stop.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4522,13 +4522,13 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2{
dir = 5
},
/obj/item/clothing/under/syndicate/medic,
/obj/item/clothing/under/syndicate/medic{
/obj/item/clothing/under/cybersun/medic,
/obj/item/clothing/under/cybersun/medic{
pixel_x = -5;
pixel_y = -2
},
/obj/structure/closet/crate/secure/gear,
/obj/item/clothing/suit/armor/vest/trauma{
/obj/item/clothing/suit/armor/vest/cybersun/trauma{
pixel_y = -7;
pixel_x = 4
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/WasteRuins/wasteplanet_icwbase.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,15 +2569,15 @@
secure = 1;
name = "secure cybersun locker"
},
/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun,
/obj/item/clothing/under/syndicate/cybersun/research,
/obj/item/clothing/under/cybersun/doctor,
/obj/item/clothing/under/cybersun/coverall,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -21;
pixel_y = 11
},
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
/obj/item/clothing/head/beret/cmo/cybersun,
/obj/item/clothing/suit/armor/cybersun,
/obj/item/clothing/head/cybersun/cmo,
/turf/open/floor/carpet/purple,
/area/ruin/wasteplanet/wasteplanet_icwbase/cic)
"kn" = (
Expand Down Expand Up @@ -10441,7 +10441,7 @@
},
/obj/item/clothing/suit/toggle/labcoat/raincoat,
/obj/item/clothing/head/soft/cybersun/medical,
/obj/item/clothing/under/syndicate/cybersun,
/obj/item/clothing/under/cybersun,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/radiation,
/obj/item/clothing/head/radiation,
Expand Down
8 changes: 4 additions & 4 deletions _maps/_mod_celadon/RandomRuins/AsteroidRuins/lima_facility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2669,10 +2669,10 @@
/obj/item/clothing/shoes/sneakers/suns,
/obj/item/clothing/mask/gas/clip,
/obj/item/storage/belt/medical,
/obj/item/clothing/head/helmet/medical{
/obj/item/clothing/head/helmet/m10/cybersun/trauma{
name = "improper trauma team helmet"
},
/obj/item/clothing/suit/armor/vest/trauma{
/obj/item/clothing/suit/armor/vest/cybersun/trauma{
name = "Gorlex trauma team armor vest"
},
/turf/open/floor/plasteel/darkbluefull/darkblue{
Expand Down Expand Up @@ -7543,10 +7543,10 @@
/obj/item/clothing/shoes/sneakers/suns,
/obj/item/clothing/mask/gas/clip,
/obj/item/storage/belt/medical,
/obj/item/clothing/head/helmet/medical{
/obj/item/clothing/head/helmet/m10/cybersun/trauma{
name = "improper trauma team helmet"
},
/obj/item/clothing/suit/armor/vest/trauma{
/obj/item/clothing/suit/armor/vest/cybersun/trauma{
name = "Gorlex trauma team armor vest"
},
/turf/open/floor/plasteel/darkbluefull/darkblue{
Expand Down
4 changes: 2 additions & 2 deletions _maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,8 +1244,8 @@
name = "Cybersun Brand Jorts";
desc = "'The days of spring will surely bring the birds and bees cavorting. But since I am a Syndicate, I'd much rather be jorting' -CEO of Cybersun"
},
/obj/item/clothing/under/syndicate/cybersun,
/obj/item/clothing/under/syndicate/cybersun,
/obj/item/clothing/under/cybersun,
/obj/item/clothing/under/cybersun,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/gorlex,
Expand Down
6 changes: 3 additions & 3 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,15 +1574,15 @@
/obj/effect/turf_decal/trimline/opaque/cybersunteal/filled/line{
dir = 1
},
/obj/item/clothing/under/syndicate/cybersun/officer,
/obj/item/clothing/under/cybersun/officer,
/obj/structure/closet/secure_closet{
anchored = 1;
icon_state = "hos";
name = "Cybersun Locker";
req_access = list(150, 20);
populate = 0
},
/obj/item/clothing/suit/cybersun_suit,
/obj/item/clothing/suit/cybersun,
/obj/item/clothing/head/soft/cybersun,
/obj/item/clothing/gloves/combat,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -8744,7 +8744,7 @@
populate = 0
},
/obj/item/defibrillator,
/obj/item/clothing/under/syndicate/medic,
/obj/item/clothing/under/cybersun/medic,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/soft/cybersun/medical,
/obj/item/clothing/suit/toggle/labcoat/raincoat,
Expand Down
6 changes: 3 additions & 3 deletions _maps/_mod_celadon/RandomRuins/JungleRuins/jungle_serene_hunts.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4981,7 +4981,7 @@
/obj/structure/sign/painting/library{
pixel_y = 29
},
/obj/item/clothing/head/HoS/cybersun,
/obj/item/clothing/head/cybersun,
/turf/open/floor/carpet/red/jungleplanet,
/area/ruin/powered/hunts/hotel)
"PP" = (
Expand Down Expand Up @@ -5847,11 +5847,11 @@
dir = 10
},
/obj/item/clothing/under/misc/pj/blue,
/obj/item/clothing/suit/cybersun_suit{
/obj/item/clothing/suit/cybersun{
pixel_x = 7;
pixel_y = -3
},
/obj/item/clothing/under/syndicate/cybersun/officer{
/obj/item/clothing/under/cybersun/officer{
pixel_y = -7;
pixel_x = -5
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2326,7 +2326,7 @@
dir = 6
},
/obj/item/clothing/head/soft/cybersun,
/obj/item/clothing/suit/cybersun_suit,
/obj/item/clothing/suit/cybersun,
/turf/open/floor/carpet/nanoweave/red,
/area/ruin/unpowered/listening_post/commons)
"TS" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_nomads_stop.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4564,13 +4564,13 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden/layer2{
dir = 5
},
/obj/item/clothing/under/syndicate/medic,
/obj/item/clothing/under/syndicate/medic{
/obj/item/clothing/under/cybersun/medic,
/obj/item/clothing/under/cybersun/medic{
pixel_x = -5;
pixel_y = -2
},
/obj/structure/closet/crate/secure/gear,
/obj/item/clothing/suit/armor/vest/trauma{
/obj/item/clothing/suit/armor/vest/cybersun/trauma{
pixel_y = -7;
pixel_x = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/RandomRuins/SandRuins/whitesands_surface_trainyard.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8038,7 +8038,7 @@
icon_state = "syndicate";
anchored = 1
},
/obj/item/clothing/under/syndicate/cybersun/officer{
/obj/item/clothing/under/cybersun/officer{
pixel_y = -7;
pixel_x = -8
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_icwbase.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2562,15 +2562,15 @@
secure = 1;
name = "secure cybersun locker"
},
/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun,
/obj/item/clothing/under/syndicate/cybersun/research,
/obj/item/clothing/under/cybersun/doctor,
/obj/item/clothing/under/cybersun/coverall,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -21;
pixel_y = 11
},
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
/obj/item/clothing/head/beret/cmo/cybersun,
/obj/item/clothing/suit/armor/cybersun,
/obj/item/clothing/head/cybersun/cmo,
/turf/open/floor/carpet/purple,
/area/ruin/wasteplanet/wasteplanet_icwbase/cic)
"kn" = (
Expand Down Expand Up @@ -10432,7 +10432,7 @@
},
/obj/item/clothing/suit/toggle/labcoat/raincoat,
/obj/item/clothing/head/soft/cybersun/medical,
/obj/item/clothing/under/syndicate/cybersun,
/obj/item/clothing/under/cybersun,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/suit/radiation,
/obj/item/clothing/head/radiation,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/map_files/centcomm_ship.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13211,7 +13211,7 @@
},
/obj/machinery/light/directional/east,
/obj/item/paper_bin/carbon,
/obj/item/clothing/head/HoS/cybersun{
/obj/item/clothing/head/cybersun{
pixel_x = 2
},
/obj/item/pen/fountain,
Expand Down
Loading
Loading