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

Jump to bottom

Rsf, rsp and rcd removal #6726

Merged
merged 8 commits into from
Jul 17, 2024
Merged

Rsf, rsp and rcd removal #6726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9676fa0
eh
uuuuhuuuu Jul 13, 2024
a184b87
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 13, 2024
444b74c
ehm
uuuuhuuuu Jul 16, 2024
98fa1ae
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 16, 2024
2a78285
ehm
uuuuhuuuu Jul 16, 2024
8c671da
rs ehh hwhatever removal
uuuuhuuuu Jul 16, 2024
847a919
eh
uuuuhuuuu Jul 16, 2024
81abe7d
more removal
uuuuhuuuu Jul 16, 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
5 changes: 0 additions & 5 deletions code/game/machinery/autolathe_datums.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@
path = /obj/item/circuitboard/apc
category = AUTOLATHE_CATEGORY_ENGINEERING

/datum/autolathe/recipe/rcd_ammo
name = "matter cartridge"
path = /obj/item/ammo_rcd
category = AUTOLATHE_CATEGORY_ENGINEERING

/datum/autolathe/recipe/table_parts
name = "table parts"
path = /obj/item/frame/table
Expand Down
194 changes: 0 additions & 194 deletions code/game/objects/items/devices/RCD.dm
View file
Open in desktop

This file was deleted.

98 changes: 0 additions & 98 deletions code/game/objects/items/devices/RSF.dm
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions code/game/objects/items/devices/RSP.dm
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions code/game/objects/structures/crates_lockers/crates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,6 @@
name = "RCD crate"
desc = "A crate for the storage of the RCD."

/obj/structure/closet/crate/rcd/Initialize()
. = ..()
new /obj/item/ammo_rcd(src)
new /obj/item/ammo_rcd(src)
new /obj/item/ammo_rcd(src)
new /obj/item/device/rcd(src)

/obj/structure/closet/crate/freezer/rations //Fpr use in the escape shuttle
desc = "A crate of emergency rations."
name = "Emergency Rations"
Expand Down
3 changes: 0 additions & 3 deletions colonialmarines.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,9 +1137,6 @@
#include "code\game\objects\items\devices\pinpointer.dm"
#include "code\game\objects\items\devices\pipe_painter.dm"
#include "code\game\objects\items\devices\portable_vendor.dm"
#include "code\game\objects\items\devices\RCD.dm"
#include "code\game\objects\items\devices\RSF.dm"
#include "code\game\objects\items\devices\RSP.dm"
#include "code\game\objects\items\devices\scanners.dm"
#include "code\game\objects\items\devices\suit_cooling.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
Expand Down
1 change: 0 additions & 1 deletion maps/map_files/CORSAT/Corsat.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35676,7 +35676,6 @@
/area/corsat/omega/complex)
"lHI" = (
/obj/structure/surface/table/reinforced,
/obj/item/ammo_rcd,
/turf/open/floor/corsat/retrosquareslight,
/area/corsat/sigma/south/complex)
"lHK" = (
Expand Down
4 changes: 0 additions & 4 deletions maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10137,10 +10137,6 @@
/area/ice_colony/surface/storage_unit/research)
"aKo" = (
/obj/structure/surface/rack,
/obj/item/ammo_rcd,
/obj/item/ammo_rcd,
/obj/item/ammo_rcd,
/obj/item/ammo_rcd,
/turf/open/floor/vault2/west,
/area/ice_colony/surface/storage_unit/research)
"aKp" = (
Expand Down
Loading