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.

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

Completely removes the SVG from the game and it's variants #2734

Merged
merged 10 commits into from
Feb 23, 2024
Merged

Completely removes the SVG from the game and it's variants #2734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
54e9f67
initial
rye-rice Feb 15, 2024
c787fb2
weh
rye-rice Feb 16, 2024
94e5be6
fucking
rye-rice Feb 16, 2024
c682f2f
fuck+some sprite removals i missed
rye-rice Feb 16, 2024
9bce338
Update code/game/objects/items/storage/belt.dm
rye-rice Feb 16, 2024
be885f4
calls for help/ better bipod deploying behavior
rye-rice Feb 16, 2024
84ad736
Merge branch 'skm_rifle' of https://github.com/retlaw34/Shiptest into…
rye-rice Feb 16, 2024
975cddb
fix
rye-rice Feb 17, 2024
d3c6031
sprite fixes
rye-rice Feb 20, 2024
2b4c49f
Merge remote-tracking branch 'upstream/master' into skm_rifle
rye-rice Feb 23, 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
10 changes: 5 additions & 5 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,9 +1761,9 @@
pixel_y = -5
},
/obj/item/ammo_casing/a4570,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/skm_545_39,
/obj/item/ammo_box/magazine/skm_545_39,
/obj/item/ammo_box/magazine/skm_545_39,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/illestren_a850r,
/turf/open/floor/plasteel/tech,
Expand Down Expand Up @@ -1839,7 +1839,7 @@
/obj/structure/railing/corner{
dir = 8
},
/mob/living/simple_animal/hostile/frontier/ranged/trooper/ak47/neutured,
/mob/living/simple_animal/hostile/frontier/ranged/trooper/skm/neutured,
/turf/open/floor/plasteel/stairs{
dir = 1
},
Expand Down Expand Up @@ -2281,7 +2281,7 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/gear,
/obj/item/gun/ballistic/automatic/smg/aks74u{
/obj/item/gun/ballistic/automatic/smg/skm_carbine{
pixel_y = -6
},
/obj/item/gun/ballistic/automatic/zip_pistol,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/automatic/smg/aks74u,
/obj/item/gun/ballistic/automatic/smg/skm_carbine,
/obj/item/ammo_casing{
dir = 10;
pixel_x = -7;
Expand Down Expand Up @@ -958,7 +958,7 @@
pixel_y = 11
},
/obj/effect/gibspawner/human,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/ammo_box/magazine/skm_545_39,
/turf/open/floor/plasteel/tech,
/area/ship/science)
"oJ" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,8 +995,8 @@
/area/overmap_encounter/planetoid/sand/explored)
"KJ" = (
/obj/structure/table,
/obj/item/gun/ballistic/automatic/smg/aks74u,
/obj/item/ammo_box/magazine/aks74u,
/obj/item/gun/ballistic/automatic/smg/skm_carbine,
/obj/item/ammo_box/magazine/skm_545_39,
/turf/open/floor/concrete,
/area/ruin)
"Ld" = (
Expand Down
29 changes: 6 additions & 23 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2207,9 +2207,6 @@
/obj/structure/table/wood/fancy,
/turf/open/floor/wood,
/area/wizard_station)
"axw" = (
/turf/open/floor/engine/cult,
/area/wizard_station)
"axx" = (
/obj/machinery/vending/snack,
/turf/open/floor/engine/cult,
Expand Down Expand Up @@ -12592,10 +12589,10 @@
dir = 8
},
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
/obj/item/gun/ballistic/automatic/assault/skm/inteq{
pixel_y = 3
},
/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
/obj/item/gun/ballistic/automatic/assault/skm/inteq{
pixel_y = -1;
pixel_x = -5
},
Expand Down Expand Up @@ -14665,20 +14662,6 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
"sow" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
/obj/effect/turf_decal/corner/transparent/neutral,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 4
},
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"spy" = (
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
Expand Down Expand Up @@ -15212,10 +15195,10 @@
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/smg/inteq{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_x = 2
},
/obj/item/gun/ballistic/automatic/smg/inteq{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_x = -1;
pixel_y = -6
},
Expand Down Expand Up @@ -23555,7 +23538,7 @@ aqZ
aqZ
aqZ
awN
axw
aqZ
aqE
aqZ
aqZ
Expand Down Expand Up @@ -64657,7 +64640,7 @@ aiH
mpw
rzn
ail
sow
gDP
gTh
agb
aqg
Expand Down
12 changes: 6 additions & 6 deletions _maps/shuttles/independent/independent_halftrack.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,12 +1502,12 @@
/obj/structure/closet/secure_closet/security,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/automatic/assault/ak47,
/obj/item/gun/ballistic/automatic/assault/ak47,
/obj/item/ammo_box/magazine/ak47,
/obj/item/ammo_box/magazine/ak47,
/obj/item/ammo_box/magazine/ak47,
/obj/item/ammo_box/magazine/ak47,
/obj/item/gun/ballistic/automatic/assault/skm,
/obj/item/gun/ballistic/automatic/assault/skm,
/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/skm_762_40,
/obj/item/ammo_box/magazine/m50,
/obj/item/ammo_box/magazine/m50,
/obj/item/ammo_box/magazine/m50,
Expand Down
114 changes: 57 additions & 57 deletions _maps/shuttles/inteq/inteq_colossus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,39 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/security)
"hx" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/mask/gas/sechailer/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/structure/closet/secure_closet{
anchored = 1;
can_be_unanchored = 1;
icon_state = "warden";
name = "master at arms' locker";
req_access_txt = "3"
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/megaphone/sec,
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
/obj/item/reagent_containers/spray/pepper,
/obj/item/clothing/head/warden/inteq,
/obj/item/clothing/suit/armor/vest/security/warden/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"hD" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ship/hallway/port)
Expand Down Expand Up @@ -810,39 +843,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/ship/maintenance/port)
"iS" = (
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/mask/gas/sechailer/inteq,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/shoes/combat,
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/structure/closet/secure_closet{
anchored = 1;
can_be_unanchored = 1;
icon_state = "warden";
name = "master at arms' locker";
req_access_txt = "3"
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/megaphone/sec,
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
/obj/item/reagent_containers/spray/pepper,
/obj/item/clothing/head/warden/inteq,
/obj/item/clothing/suit/armor/vest/security/warden/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"iT" = (
/obj/machinery/vending/snack/random,
/obj/effect/turf_decal/trimline/opaque/yellow/line,
Expand Down Expand Up @@ -1440,27 +1440,7 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/plating,
/area/ship/engineering)
"qR" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
},
/obj/machinery/navbeacon/wayfinding{
codes_txt = "patrol;next_patrol=office";
location = "port"
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"qS" = (
/obj/structure/dresser,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"qX" = (
"qQ" = (
/obj/structure/rack,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 10;
Expand All @@ -1477,12 +1457,32 @@
pixel_x = 5;
pixel_y = 5
},
/obj/item/gun/ballistic/automatic/smg/inteq{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
pixel_y = -2
},
/obj/machinery/airalarm/directional/west,
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"qR" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
},
/obj/machinery/navbeacon/wayfinding{
codes_txt = "patrol;next_patrol=office";
location = "port"
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"qS" = (
/obj/structure/dresser,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/obj/machinery/airalarm/directional/south,
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"rb" = (
/obj/machinery/power/shieldwallgen/atmos{
anchored = 1;
Expand Down Expand Up @@ -5082,7 +5082,7 @@ Kv
EI
Dq
MQ
qX
qQ
PV
"}
(23,1,1) = {"
Expand Down Expand Up @@ -5170,7 +5170,7 @@ eM
pd
gX
WC
iS
hx
XA
"}
(27,1,1) = {"
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/inteq/inteq_hound.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,13 +580,13 @@
/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
pixel_y = -5
},
/obj/item/ammo_box/magazine/ak47{
/obj/item/ammo_box/magazine/skm_762_40{
pixel_x = -7
},
/obj/item/ammo_box/magazine/ak47{
/obj/item/ammo_box/magazine/skm_762_40{
pixel_x = 7
},
/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
/obj/item/gun/ballistic/automatic/assault/skm/inteq{
pixel_x = -5
},
/obj/structure/closet/secure_closet/wall{
Expand Down Expand Up @@ -2384,7 +2384,7 @@
pixel_x = -11;
pixel_y = 5
},
/obj/item/storage/toolbox/ammo/a762_39{
/obj/item/ammo_box/a762_40/inteq{
pixel_x = 5;
pixel_y = 12
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/subshuttles/frontiersmen_gut.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/gear,
/obj/item/gun/ballistic/automatic/smg/aks74u{
/obj/item/gun/ballistic/automatic/smg/skm_carbine{
pixel_y = -6
},
/obj/item/gun/ballistic/automatic/zip_pistol,
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,10 +933,10 @@
item_state = "inteq_webbing"
supports_variations = VOX_VARIATION

/obj/item/storage/belt/security/webbing/inteq/ak47/PopulateContents()
/obj/item/storage/belt/security/webbing/inteq/skm/PopulateContents()
. = ..()
for(var/i in 1 to 7)
new /obj/item/ammo_box/magazine/ak47(src)
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/skm_762_40(src)

/obj/item/storage/belt/security/webbing/inteq/alt
name = "inteq drop pouch harness"
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/storage/toolbox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,11 @@
for(var/i in 1 to 7)
new /obj/item/ammo_box/magazine/illestren_a850r(src)

/obj/item/storage/toolbox/ammo/a762_39/PopulateContents()
name = "ammo can (7.62x39mm)"
/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
name = "ammo can (7.62x40mm CLIP)"
icon_state = "ammobox_762"
for (var/i in 1 to 4)
new /obj/item/ammo_box/a762_39(src)
new /obj/item/ammo_box/a762_40(src)

/obj/item/storage/toolbox/ammo/a308/PopulateContents()
name = "ammo can (.308)"
Expand Down
Loading
Loading