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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new lawsets and reorganise AI upload, the Third #15743

Merged
merged 34 commits into from
Jul 25, 2021
Merged

Add new lawsets and reorganise AI upload, the Third #15743

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a68ddcb
lawsets update
datlo Mar 21, 2021
b490670
Revert "lawsets update"
datlo Mar 21, 2021
f37c9e5
Lawsets update
datlo Mar 21, 2021
be4284e
Remove quotes on ai module names
datlo Mar 21, 2021
6570bbf
fix map file
datlo Mar 21, 2021
c5541af
Fix coding style
datlo Mar 21, 2021
2da8b68
Update hippocratic per review
datlo Mar 28, 2021
7647d72
Update hippocratic per review
datlo Mar 28, 2021
c2909f2
Update hippocratic per review
datlo Mar 28, 2021
ee95935
Merge remote-tracking branch 'upstream/master' into master
datlo Mar 28, 2021
5f5f2ca
Merge branch 'master' into lawsets
datlo Mar 28, 2021
97e0c9c
Merge remote-tracking branch 'upstream/master'
datlo Apr 2, 2021
337d8f6
Merge remote-tracking branch 'upstream/master'
datlo Apr 21, 2021
ff571b0
Merge remote-tracking branch 'upstream/master'
datlo Apr 28, 2021
cc14014
Merge branch 'master' into lawsets
datlo May 7, 2021
ce2b708
Merge remote-tracking branch 'upstream/master'
datlo May 7, 2021
2f6727b
Merge branch 'master' into lawsets
datlo May 7, 2021
e6ca187
Fix merge conflict
datlo May 7, 2021
dca1783
Update code/game/objects/items/weapons/AI_modules.dm
datlo May 13, 2021
b424ddc
Merge remote-tracking branch 'upstream/master'
datlo May 15, 2021
7401ce5
Merge remote-tracking branch 'upstream/master'
datlo May 17, 2021
ae00ada
Merge remote-tracking branch 'upstream/master'
datlo May 21, 2021
4e49312
Merge remote-tracking branch 'upstream/master'
datlo May 25, 2021
676bfa7
Add a pilot seat to the ERT shuttle
datlo May 25, 2021
ddf3102
Revert "Add a pilot seat to the ERT shuttle"
datlo May 25, 2021
a474e6b
Merge remote-tracking branch 'upstream/master'
datlo May 26, 2021
11c64ae
Merge remote-tracking branch 'upstream/master'
datlo May 27, 2021
c5392e9
Merge remote-tracking branch 'upstream/master' into lawsets
datlo May 28, 2021
cdc71bd
Update MetaStation.dmm
datlo May 28, 2021
06efafd
Merge remote-tracking branch 'upstream/master'
datlo Jul 7, 2021
6f5c456
Merge remote-tracking branch 'upstream/master'
datlo Jul 20, 2021
4fbba04
Merge branch 'master' into lawsets
datlo Jul 20, 2021
50353c2
deconflict
datlo Jul 20, 2021
e26c190
Update code/game/objects/items/weapons/AI_modules.dm
datlo Jul 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 6 additions & 47 deletions _maps/map_files/Delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43881,14 +43881,7 @@
},
/area/turret_protected/ai_upload)
"bNa" = (
/obj/item/aiModule/protectStation{
pixel_x = -2;
pixel_y = 2
},
/obj/item/aiModule/nanotrasen{
pixel_x = 2;
pixel_y = -2
},
/obj/item/aiModule/nanotrasen,
/obj/structure/table/glass,
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -44735,7 +44728,7 @@
/turf/simulated/wall/r_wall,
/area/turret_protected/ai_upload)
"bOO" = (
/obj/item/aiModule/quarantine,
/obj/item/aiModule/crewsimov,
/obj/structure/table/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -44771,7 +44764,7 @@
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bOS" = (
/obj/item/aiModule/freeform,
/obj/item/aiModule/corp,
/obj/structure/table/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
Expand Down Expand Up @@ -47099,25 +47092,7 @@
/turf/simulated/wall/r_wall,
/area/crew_quarters/heads/hop)
"bSH" = (
/obj/machinery/door/window{
base_state = "right";
icon_state = "right";
name = "Core Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/item/aiModule/crewsimov,
/obj/item/aiModule/freeformcore,
/obj/item/aiModule/corp,
/obj/item/aiModule/paladin,
/obj/item/aiModule/robocop,
/obj/structure/table/glass,
/obj/machinery/smartfridge/secure/circuits/aiupload/experimental,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bSI" = (
Expand Down Expand Up @@ -47161,23 +47136,7 @@
},
/area/turret_protected/ai_upload)
"bSN" = (
/obj/machinery/door/window{
dir = 8;
name = "High-Risk Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/aiModule/oxygen,
/obj/item/aiModule/oneCrewMember,
/obj/item/aiModule/purge,
/obj/item/aiModule/antimov,
/obj/structure/table/glass,
/obj/machinery/smartfridge/secure/circuits/aiupload/highrisk,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bSO" = (
Expand Down Expand Up @@ -99669,7 +99628,7 @@
icon_state = "2-4";
tag = ""
},
/obj/machinery/smartfridge/secure/chemistry/virology,
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
datlo marked this conversation as resolved.
Show resolved Hide resolved
/obj/effect/decal/warning_stripes/east,
/turf/simulated/floor/plasteel,
/area/medical/virology)
Expand Down
52 changes: 15 additions & 37 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16030,13 +16030,13 @@
codes_txt = "patrol;next_patrol=1-BrigCells";
location = "0-SecurityDesk"
},
/mob/living/simple_animal/bot/secbot/beepsky,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/mob/living/simple_animal/bot/secbot/beepsky,
/turf/simulated/floor/plasteel,
/area/hallway/primary/fore)
"aJn" = (
Expand Down Expand Up @@ -17360,7 +17360,6 @@
"aMc" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
Expand All @@ -17370,6 +17369,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/fore)
"aMd" = (
Expand Down Expand Up @@ -19889,10 +19889,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 8
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
Expand Down Expand Up @@ -20938,7 +20938,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/item/aiModule/quarantine,
/obj/item/aiModule/crewsimov,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -20996,7 +20996,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/item/aiModule/freeform,
/obj/item/aiModule/nanotrasen,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -21521,23 +21521,11 @@
/turf/simulated/floor/plasteel,
/area/quartermaster/storage)
"aVw" = (
/obj/structure/table,
/obj/item/aiModule/asimov,
/obj/item/aiModule/freeformcore,
/obj/machinery/door/window{
base_state = "right";
icon_state = "right";
name = "Core Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/item/aiModule/corp,
/obj/item/aiModule/paladin,
/obj/item/aiModule/robocop,
/obj/machinery/flasher{
id = "AI";
pixel_y = 24
},
/obj/machinery/smartfridge/secure/circuits/aiupload/experimental,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -21591,21 +21579,11 @@
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"aVA" = (
/obj/structure/table,
/obj/machinery/door/window{
dir = 8;
name = "High-Risk Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/machinery/flasher{
id = "AI";
pixel_y = 24
},
/obj/item/aiModule/antimov,
/obj/item/aiModule/oxygen,
/obj/item/aiModule/oneCrewMember,
/obj/item/aiModule/purge,
/obj/machinery/smartfridge/secure/circuits/aiupload/highrisk,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -22541,7 +22519,7 @@
id = "AI";
pixel_y = -24
},
/obj/item/aiModule/protectStation,
/obj/item/aiModule/corp,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -29663,13 +29641,13 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/mob/living/simple_animal/lizard{
name = "Wags-His-Tail";
real_name = "Wags-His-Tail"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
Expand Down Expand Up @@ -36451,9 +36429,9 @@
d2 = 4;
icon_state = "2-4"
},
/mob/living/simple_animal/bot/secbot/pingsky,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/mob/living/simple_animal/bot/secbot/pingsky,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -64210,13 +64188,13 @@
d2 = 8;
icon_state = "1-8"
},
/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
/area/maintenance/aft)
"cFd" = (
Expand Down Expand Up @@ -66641,7 +66619,7 @@
/obj/machinery/alarm{
pixel_y = 23
},
/obj/machinery/smartfridge/secure/chemistry/virology,
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
datlo marked this conversation as resolved.
Show resolved Hide resolved
/turf/simulated/floor/plasteel{
icon_state = "whitegreenfull"
},
Expand Down Expand Up @@ -81290,13 +81268,13 @@
},
/area/security/podbay)
"ppw" = (
/mob/living/carbon/human/monkey,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/mob/living/carbon/human/monkey,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down
45 changes: 5 additions & 40 deletions _maps/map_files/cyberiad/cyberiad.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35916,7 +35916,7 @@
/area/bridge/meeting_room)
"bzT" = (
/obj/structure/table,
/obj/item/aiModule/quarantine,
/obj/item/aiModule/crewsimov,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -36954,25 +36954,7 @@
/turf/simulated/floor/carpet,
/area/bridge/meeting_room)
"bCH" = (
/obj/structure/table,
/obj/machinery/door/window{
base_state = "right";
icon_state = "right";
name = "Core Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/item/aiModule/crewsimov,
/obj/item/aiModule/freeformcore,
/obj/item/aiModule/corp,
/obj/item/aiModule/paladin,
/obj/item/aiModule/robocop,
/obj/machinery/smartfridge/secure/circuits/aiupload/experimental,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bCI" = (
Expand Down Expand Up @@ -37572,7 +37554,6 @@
/area/turret_protected/ai_upload)
"bEb" = (
/obj/structure/table,
/obj/item/aiModule/protectStation,
/obj/item/aiModule/nanotrasen,
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -37943,7 +37924,7 @@
/area/maintenance/port)
"bFe" = (
/obj/structure/table,
/obj/item/aiModule/freeform,
/obj/item/aiModule/corp,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -39781,23 +39762,7 @@
},
/area/turret_protected/ai_upload)
"bIM" = (
/obj/structure/table,
/obj/machinery/door/window{
dir = 8;
name = "High-Risk Modules";
req_access_txt = "20"
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/item/aiModule/oxygen,
/obj/item/aiModule/oneCrewMember,
/obj/item/aiModule/purge,
/obj/item/aiModule/antimov,
/obj/machinery/smartfridge/secure/circuits/aiupload/highrisk,
/turf/simulated/floor/bluegrid,
/area/turret_protected/ai_upload)
"bIN" = (
Expand Down Expand Up @@ -57498,7 +57463,7 @@
},
/area/medical/virology)
"cpM" = (
/obj/machinery/smartfridge/secure/chemistry/virology,
/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
datlo marked this conversation as resolved.
Show resolved Hide resolved
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
Expand Down