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

readds rd/sar rigs, adds a rig to the CMO, repaths modules/rigsuits to modules/hardsuits in preparation for the rig update #5686

Merged
merged 3 commits into from
Jul 13, 2023
Merged

readds rd/sar rigs, adds a rig to the CMO, repaths modules/rigsuits to modules/hardsuits in preparation for the rig update #5686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8aa907
1
Jul 8, 2023
1bc7325
2
Jul 8, 2023
5595374
Merge remote-tracking branch 'citrp/master' into hardsuit_shit
Jul 8, 2023
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
56 changes: 28 additions & 28 deletions citadel.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2647,6 +2647,34 @@
#include "code\modules\ghostroles\roles\hermit.dm"
#include "code\modules\ghostroles\roles\pirate.dm"
#include "code\modules\ghosttrap\trap.dm"
#include "code\modules\hardsuits\_rig.dm"
#include "code\modules\hardsuits\activation.dm"
#include "code\modules\hardsuits\rig_attackby.dm"
#include "code\modules\hardsuits\rig_pieces.dm"
#include "code\modules\hardsuits\rig_verbs.dm"
#include "code\modules\hardsuits\rig_wiring.dm"
#include "code\modules\hardsuits\modules\combat.dm"
#include "code\modules\hardsuits\modules\combat_vr.dm"
#include "code\modules\hardsuits\modules\computer.dm"
#include "code\modules\hardsuits\modules\modules.dm"
#include "code\modules\hardsuits\modules\ninja.dm"
#include "code\modules\hardsuits\modules\utility.dm"
#include "code\modules\hardsuits\modules\utility_vr.dm"
#include "code\modules\hardsuits\modules\vision.dm"
#include "code\modules\hardsuits\suits\combat.dm"
#include "code\modules\hardsuits\suits\ert.dm"
#include "code\modules\hardsuits\suits\light.dm"
#include "code\modules\hardsuits\suits\merc.dm"
#include "code\modules\hardsuits\suits\pmc.dm"
#include "code\modules\hardsuits\suits\species\protean.dm"
#include "code\modules\hardsuits\suits\species\unathi.dm"
#include "code\modules\hardsuits\suits\species\vox.dm"
#include "code\modules\hardsuits\suits\station\cargo.dm"
#include "code\modules\hardsuits\suits\station\engineering.dm"
#include "code\modules\hardsuits\suits\station\medical.dm"
#include "code\modules\hardsuits\suits\station\misc.dm"
#include "code\modules\hardsuits\suits\station\science.dm"
#include "code\modules\hardsuits\suits\station\security.dm"
#include "code\modules\holidays\_holiday.dm"
#include "code\modules\holidays\christmas.dm"
#include "code\modules\holidays\christmas_loadout.dm"
Expand Down Expand Up @@ -4265,34 +4293,6 @@
#include "code\modules\resleeving\machines.dm"
#include "code\modules\resleeving\mirror.dm"
#include "code\modules\resleeving\sleevecard.dm"
#include "code\modules\rigsuits\_rig.dm"
#include "code\modules\rigsuits\activation.dm"
#include "code\modules\rigsuits\rig_attackby.dm"
#include "code\modules\rigsuits\rig_pieces.dm"
#include "code\modules\rigsuits\rig_verbs.dm"
#include "code\modules\rigsuits\rig_wiring.dm"
#include "code\modules\rigsuits\modules\combat.dm"
#include "code\modules\rigsuits\modules\combat_vr.dm"
#include "code\modules\rigsuits\modules\computer.dm"
#include "code\modules\rigsuits\modules\modules.dm"
#include "code\modules\rigsuits\modules\ninja.dm"
#include "code\modules\rigsuits\modules\utility.dm"
#include "code\modules\rigsuits\modules\utility_vr.dm"
#include "code\modules\rigsuits\modules\vision.dm"
#include "code\modules\rigsuits\suits\combat.dm"
#include "code\modules\rigsuits\suits\ert.dm"
#include "code\modules\rigsuits\suits\light.dm"
#include "code\modules\rigsuits\suits\merc.dm"
#include "code\modules\rigsuits\suits\pmc.dm"
#include "code\modules\rigsuits\suits\species\protean.dm"
#include "code\modules\rigsuits\suits\species\unathi.dm"
#include "code\modules\rigsuits\suits\species\vox.dm"
#include "code\modules\rigsuits\suits\station\cargo.dm"
#include "code\modules\rigsuits\suits\station\engineering.dm"
#include "code\modules\rigsuits\suits\station\medical.dm"
#include "code\modules\rigsuits\suits\station\misc.dm"
#include "code\modules\rigsuits\suits\station\science.dm"
#include "code\modules\rigsuits\suits\station\security.dm"
#include "code\modules\rogueminer_vr\asteroid.dm"
#include "code\modules\rogueminer_vr\controller.dm"
#include "code\modules\rogueminer_vr\debug.dm"
Expand Down
0 code/modules/rigsuits/_rig.dm → code/modules/hardsuits/_rig.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/activation.dm → code/modules/hardsuits/activation.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/defense.dm → code/modules/hardsuits/defense.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/combat.dm → code/modules/hardsuits/modules/combat.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/combat_vr.dm → code/modules/hardsuits/modules/combat_vr.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/computer.dm → code/modules/hardsuits/modules/computer.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/modules.dm → code/modules/hardsuits/modules/modules.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/ninja.dm → code/modules/hardsuits/modules/ninja.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/utility.dm → code/modules/hardsuits/modules/utility.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/utility_vr.dm → code/modules/hardsuits/modules/utility_vr.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/modules/vision.dm → code/modules/hardsuits/modules/vision.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/pieces.dm → code/modules/hardsuits/pieces.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/rig.dm → code/modules/hardsuits/rig.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/rig_attackby.dm → code/modules/hardsuits/rig_attackby.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/rig_pieces.dm → code/modules/hardsuits/rig_pieces.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/rig_verbs.dm → code/modules/hardsuits/rig_verbs.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/rig_wiring.dm → code/modules/hardsuits/rig_wiring.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/combat.dm → code/modules/hardsuits/suits/combat.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/ert.dm → code/modules/hardsuits/suits/ert.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/light.dm → code/modules/hardsuits/suits/light.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/merc.dm → code/modules/hardsuits/suits/merc.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/pmc.dm → code/modules/hardsuits/suits/pmc.dm
View file
Open in desktop
File renamed without changes.
0 ...modules/rigsuits/suits/species/protean.dm → ...odules/hardsuits/suits/species/protean.dm
View file
Open in desktop
File renamed without changes.
0 .../modules/rigsuits/suits/species/unathi.dm → ...modules/hardsuits/suits/species/unathi.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/species/vox.dm → code/modules/hardsuits/suits/species/vox.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/station/cargo.dm → .../modules/hardsuits/suits/station/cargo.dm
View file
Open in desktop
File renamed without changes.
0 ...les/rigsuits/suits/station/engineering.dm → ...es/hardsuits/suits/station/engineering.dm
View file
Open in desktop
File renamed without changes.
0 ...modules/rigsuits/suits/station/medical.dm → ...odules/hardsuits/suits/station/medical.dm
View file
Open in desktop
File renamed without changes.
0 code/modules/rigsuits/suits/station/misc.dm → code/modules/hardsuits/suits/station/misc.dm
View file
Open in desktop
File renamed without changes.
0 ...modules/rigsuits/suits/station/science.dm → ...odules/hardsuits/suits/station/science.dm
View file
Open in desktop
File renamed without changes.
0 ...odules/rigsuits/suits/station/security.dm → ...dules/hardsuits/suits/station/security.dm
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions maps/rift/levels/rift-04-surface1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10749,6 +10749,7 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 10
},
/obj/item/hardsuit/medical/equipped,
/turf/simulated/floor/tiled/white,
/area/medical/medbay_emt_bay)
"gZK" = (
Expand Down Expand Up @@ -27737,6 +27738,7 @@
/obj/item/clothing/mask/breath/anesthetic,
/obj/item/clothing/gloves/sterile/nitrile,
/obj/item/clothing/mask/muzzle,
/obj/item/hardsuit/medical/equipped,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/cmo)
"reE" = (
Expand Down
1 change: 1 addition & 0 deletions maps/rift/levels/rift-05-surface2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4854,6 +4854,7 @@
/obj/machinery/door/window/eastleft{
name = "Gear Storage"
},
/obj/item/hardsuit/hazmat/equipped,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/heads/hor)
"ddZ" = (
Expand Down