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

Fixes Mapped Directional Sprites, Adds Pet, General Mapping Bug Fixes #6118

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Fixes Mapped Directional Sprites, Adds Pet, General Mapping Bug Fixes #6118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a26306
Updates to R&D on Atlas.
Captain277 Nov 3, 2023
a2594a0
Fire Alarm fixes.
Captain277 Nov 3, 2023
a3eaef9
Fixes Dexter's faction.
Captain277 Nov 3, 2023
c9923de
Catches another errant fire alarm.
Captain277 Nov 5, 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
5 changes: 5 additions & 0 deletions code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,3 +345,8 @@

/datum/ai_holder/simple_mob/intentional/sakimm/special_flee_check()
return holder.get_active_held_item()

/mob/living/simple_mob/animal/sif/sakimm/dexter
name = "Dexter"
desc = "A tame, oversized rodent with hands. It seems really friendly."
faction = "neutral"
15 changes: 15 additions & 0 deletions code/modules/tables/presets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,21 @@
material = SSmaterials.get_material(/datum/material/bone)
return ..()

/obj/structure/table/carbon
icon_state = "plain_preview"

/obj/structure/table/carbon/Initialize(mapload)
material = SSmaterials.get_material(/datum/material/carbon)
return ..()

/obj/structure/table/carbon/reinforced
icon_state = "plain_preview"

/obj/structure/table/carbon/reinforced/Initialize(mapload)
material = SSmaterials.get_material(/datum/material/carbon)
reinforced = SSmaterials.get_material(/datum/material/marble)
return ..()

/*
/obj/structure/table/bench/holotable
icon_state = "holo_preview"
Expand Down
29 changes: 13 additions & 16 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 @@ -7186,10 +7186,10 @@
/area/maintenance/engineering/pumpstation)
"eDQ" = (
/obj/machinery/power/apc{
alarms_hidden = 1;
dir = 4;
name = "east bump";
pixel_x = 24;
alarms_hidden = 1
pixel_x = 24
},
/obj/structure/cable/green{
icon_state = "0-8"
Expand Down Expand Up @@ -18664,10 +18664,6 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 1
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
Expand All @@ -18677,6 +18673,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/firealarm{
pixel_y = 24
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
"lRL" = (
Expand Down Expand Up @@ -18895,10 +18894,6 @@
/obj/machinery/computer/arcade,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"mbD" = (
/obj/random/mob/mouse,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"mbJ" = (
/obj/structure/table/woodentable,
/turf/simulated/floor/outdoors/grass/heavy/interior,
Expand Down Expand Up @@ -26783,8 +26778,8 @@
"qHS" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Research Southwest Wing Subgrid";
output_attempt = 0;
cur_coils = 2
cur_coils = 2;
output_attempt = 0
},
/obj/structure/cable/green,
/obj/structure/cable/green{
Expand Down Expand Up @@ -27489,9 +27484,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
"rdW" = (
/obj/machinery/vending/cola{
dir = 4
},
/obj/machinery/vending/cola,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"rer" = (
Expand Down Expand Up @@ -28435,6 +28428,10 @@
},
/obj/machinery/light,
/obj/structure/cable/green,
/obj/structure/dogbed{
name = "pet bed"
},
/mob/living/simple_mob/animal/sif/sakimm/dexter,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"rJv" = (
Expand Down Expand Up @@ -47420,7 +47417,7 @@ wPH
mLf
jPz
pdl
mbD
dee
nYD
srP
eZh
Expand Down
4 changes: 2 additions & 2 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 @@ -10898,11 +10898,11 @@
/turf/simulated/wall/prepainted,
/area/crew_quarters/recreation_area)
"gZt" = (
/obj/machinery/cryopod/robot,
/obj/machinery/firealarm{
dir = 8;
dir = 4;
pixel_x = 24
},
/obj/machinery/cryopod/robot,
/turf/simulated/floor/tiled/steel_ridged,
/area/assembly/chargebay)
"gZC" = (
Expand Down
83 changes: 66 additions & 17 deletions maps/rift/levels/rift-06-surface3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/captain)
"abq" = (
/obj/machinery/camera/network/exploration{
dir = 6
},
/obj/machinery/camera/network/exploration,
/turf/simulated/floor/tiled/techfloor/grid,
/area/exploration/courser_dock)
"abr" = (
Expand Down Expand Up @@ -5230,7 +5228,7 @@
/area/shuttle/excursion/general)
"aoV" = (
/obj/machinery/camera/network/exploration{
dir = 10
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/exploration/courser_dock)
Expand Down Expand Up @@ -7447,6 +7445,9 @@
dir = 1
},
/obj/effect/floor_decal/industrial/outline,
/obj/machinery/firealarm{
pixel_y = 24
},
/turf/simulated/floor/tiled/steel,
/area/exploration/explorer_prep)
"auU" = (
Expand Down Expand Up @@ -8456,6 +8457,10 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = -25
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
"axf" = (
Expand Down Expand Up @@ -10216,9 +10221,7 @@
"aCt" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/camera/network/exploration{
dir = 6
},
/obj/machinery/camera/network/exploration,
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
"aCu" = (
Expand Down Expand Up @@ -10641,6 +10644,10 @@
/obj/effect/floor_decal/corner/beige/border{
dir = 10
},
/obj/machinery/firealarm{
dir = 1;
pixel_y = -25
},
/turf/simulated/floor/tiled/steel,
/area/exploration/pathfinder_office)
"aDL" = (
Expand Down Expand Up @@ -11352,6 +11359,11 @@
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 4
},
/obj/machinery/firealarm{
dir = 4;
layer = 3.3;
pixel_x = 26
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
"aFL" = (
Expand Down Expand Up @@ -12357,9 +12369,6 @@
/turf/simulated/floor/plating,
/area/shuttle/courser/cockpit)
"aIC" = (
/obj/machinery/vending/coffee{
dir = 4
},
/obj/effect/floor_decal/borderfloor{
dir = 9
},
Expand All @@ -12369,6 +12378,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 10
},
/obj/machinery/vending/coffee,
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
"aID" = (
Expand Down Expand Up @@ -12627,12 +12637,12 @@
"aJm" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/beige/border,
/obj/machinery/camera/network/exploration{
dir = 10
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/camera/network/exploration{
dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
"aJn" = (
Expand Down Expand Up @@ -15828,6 +15838,9 @@
/area/bridge/bridge_hallway)
"aSj" = (
/obj/effect/floor_decal/spline/plain,
/obj/machinery/firealarm{
pixel_y = 24
},
/turf/simulated/floor/wood,
/area/exploration/meeting)
"aSk" = (
Expand Down Expand Up @@ -16621,7 +16634,7 @@
/obj/structure/table/standard{
name = "plastic table frame"
},
/obj/item/multitool/ai_detector,
/obj/item/multitool,
/turf/simulated/floor/tiled,
/area/hydroponics)
"aUr" = (
Expand Down Expand Up @@ -17866,6 +17879,10 @@
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 10
},
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled/steel,
/area/exploration/excursion_dock)
"aXW" = (
Expand Down Expand Up @@ -21485,6 +21502,13 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
"jew" = (
/obj/structure/table/bench/standard,
/obj/machinery/firealarm{
pixel_y = 24
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
"jil" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 4
Expand Down Expand Up @@ -23332,6 +23356,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
"orx" = (
/obj/machinery/firealarm{
pixel_y = 24
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/exploration/courser_dock)
"oti" = (
/obj/structure/bed/chair/bay/chair{
dir = 1
Expand Down Expand Up @@ -25365,6 +25395,25 @@
/obj/effect/paint/commandblue,
/turf/simulated/wall/r_wall/prepainted/command,
/area/bridge)
"uAA" = (
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/industrial/outline,
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/turf/simulated/floor/tiled,
/area/exploration/explorer_prep)
"uCG" = (
/obj/machinery/door/blast/shutters{
density = 0;
Expand Down Expand Up @@ -44660,7 +44709,7 @@ qnv
pnT
jNZ
dIa
asy
uAA
aTd
aTd
aTd
Expand Down Expand Up @@ -46031,7 +46080,7 @@ cvI
aJN
aVX
cvI
aYe
orx
aNv
aHS
aHp
Expand Down Expand Up @@ -46411,7 +46460,7 @@ aQr
asV
ahq
hXj
axm
jew
axm
ciu
mXd
Expand Down
Loading