Skip to content

Commit

Permalink
Merge branch 'master' into giant_armored_seprentids
Browse files Browse the repository at this point in the history
  • Loading branch information
@msw7007
msw7007 authored Oct 22, 2024
2 parents 4acd1f0 + c57d316 commit 514b13a
Show file tree
Hide file tree
Showing 37 changed files with 7,742 additions and 4,153 deletions.
3,633 changes: 2,192 additions & 1,441 deletions _maps/map_files220/stations/boxstation.dmm
View file

Large diffs are not rendered by default.

7,270 changes: 4,700 additions & 2,570 deletions _maps/map_files220/stations/deltastation.dmm
View file

Large diffs are not rendered by default.

134 changes: 36 additions & 98 deletions _maps/map_files220/stations/metastation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4568,18 +4568,15 @@
/area/station/maintenance/fore)
"azI" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
Expand Down Expand Up @@ -6780,8 +6777,7 @@
},
/area/station/telecomms/computer)
"aIS" = (
/obj/item/stack/sheet/plasteel{
amount = 10;
/obj/item/stack/sheet/plasteel/fifteen{
pixel_x = -2;
pixel_y = 2
},
Expand Down Expand Up @@ -7580,15 +7576,9 @@
/area/station/maintenance/fsmaint)
"aLp" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass{
amount = 12
},
Expand Down Expand Up @@ -9639,15 +9629,11 @@
/area/station/engineering/secure_storage)
"aSh" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/airlock_electronics,
/obj/item/airlock_electronics,
/obj/item/stock_parts/cell/high{
Expand Down Expand Up @@ -15635,12 +15621,8 @@
/area/station/public/storage/tools/auxiliary)
"bjq" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/storage/box/lights/mixed,
/turf/simulated/floor/plasteel{
icon_state = "yellow"
Expand All @@ -15664,9 +15646,7 @@
/area/station/public/storage/tools/auxiliary)
"bjt" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/rods{
amount = 50
},
Expand Down Expand Up @@ -21888,11 +21868,8 @@
"bAW" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty{
pixel_x = 3;
pixel_y = 3
},
Expand Down Expand Up @@ -30060,9 +30037,7 @@
"cdi" = (
/obj/structure/table/reinforced,
/obj/machinery/requests_console/directional/north,
/obj/item/stack/sheet/plasteel{
amount = 10
},
/obj/item/stack/sheet/plasteel/fifteen,
/obj/item/assembly/prox_sensor{
pixel_x = 5;
pixel_y = 7
Expand Down Expand Up @@ -31943,9 +31918,7 @@
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/sheet/metal{
amount = 10
},
/obj/item/stack/sheet/metal/ten,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cjx" = (
Expand Down Expand Up @@ -36494,14 +36467,11 @@
/obj/item/clothing/mask/gas,
/obj/item/crowbar,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/glass/fifty{
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -39919,30 +39889,19 @@
/area/station/maintenance/asmaint)
"cNi" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty{
pixel_x = 2;
pixel_y = 2
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50;
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty{
pixel_x = -2;
pixel_y = -2
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/rglass{
amount = 50;
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/rglass/fifty{
pixel_x = -2;
pixel_y = 2
},
Expand Down Expand Up @@ -60931,21 +60890,11 @@
pixel_x = -3;
pixel_y = 6
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
Expand Down Expand Up @@ -66900,11 +66849,8 @@
/area/space/nearstation)
"nzv" = (
/obj/structure/table/wood,
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass{
amount = 50;
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/glass/fifty{
pixel_x = 3;
pixel_y = 3
},
Expand Down Expand Up @@ -68810,15 +68756,9 @@
/area/station/engineering/atmos/distribution)
"oCX" = (
/obj/structure/table,
/obj/item/stack/sheet/glass{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/metal{
amount = 50
},
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/machinery/alarm/directional/north,
Expand Down Expand Up @@ -71824,9 +71764,7 @@
/area/station/security/brig)
"pYx" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
amount = 10
},
/obj/item/stack/sheet/metal/ten,
/obj/item/electropack,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/engine,
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/maint_loot_tables.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ GLOBAL_LIST_INIT(maintenance_loot_tier_2, list(
// Other rare but useful items
/obj/item/radio/headset,
/obj/item/melee/knuckleduster,
/obj/item/melee/stylet, // SS220 ADDITION
) = 3,
))

Expand Down
8 changes: 4 additions & 4 deletions code/modules/mod/mod_control.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@
if(length(req_access))
locked = TRUE
new_core?.install(src)
helmet = new /obj/item/clothing/head/mod(src)
helmet = build_head() // SS220 EDIT - original: new /obj/item/clothing/head/mod(src)
mod_parts += helmet
chestplate = new /obj/item/clothing/suit/mod(src)
chestplate = build_suit() // SS220 EDIT - original: new /obj/item/clothing/suit/mod(src)
chestplate.allowed += theme.allowed_suit_storage
mod_parts += chestplate
gauntlets = new /obj/item/clothing/gloves/mod(src)
gauntlets = build_gloves() // SS220 EDIT - original: new /obj/item/clothing/gloves/mod(src)
mod_parts += gauntlets
boots = new /obj/item/clothing/shoes/mod(src)
boots = build_shoes() // SS220 EDIT - original: new /obj/item/clothing/shoes/mod(src)
mod_parts += boots
var/list/all_parts = mod_parts + src
for(var/obj/item/part as anything in all_parts)
Expand Down
Binary file modified modular_ss220/aesthetics/closets/icons/closets.dmi
View file
Binary file not shown.
1 change: 1 addition & 0 deletions modular_ss220/clothing/_clothing.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
#include "code/shoes.dm"
#include "code/suits.dm"
#include "code/under.dm"
#include "code/mod.dm"
Loading

0 comments on commit 514b13a

Please sign in to comment.