Merge pull request #5750 from Mewchild/MC-HeadOffices

Adds pet pens to Head of Staff offices
This commit is contained in:
Novacat
2019-09-09 21:21:23 -04:00
committed by GitHub
8 changed files with 1175 additions and 743 deletions
+6
View File
@@ -351,6 +351,12 @@
name = "Cell 6"
id = "Cell 6"
/obj/machinery/door_timer/tactical_pet_storage //Vorestation Addition
name = "Tactical Pet Storage"
id = "tactical_pet_storage"
desc = "Opens and Closes on a timer. This one seals away a tactical boost in morale."
#undef FONT_SIZE
#undef FONT_COLOR
#undef FONT_STYLE
@@ -102,6 +102,7 @@
icon_state = "cat"
item_state = "cat"
named = TRUE
makes_dirt = 0 //Vorestation Edit
/mob/living/simple_mob/animal/passive/cat/kitten
name = "kitten"
@@ -14,6 +14,7 @@
health = 20
movement_cooldown = 5
makes_dirt = 0
see_in_dark = 5
mob_size = MOB_TINY
@@ -38,3 +39,12 @@
speak = list("Squee","Arf arf","Awoo","Squeak")
emote_hear = list("howls","squeals","squeaks", "barks")
emote_see = list("puffs its fur out", "shakes its fur", "stares directly at you")
/mob/living/simple_mob/animal/sif/fluffy/silky
name = "Silky"
desc = "It's a blue Diyaab! It seems to be very tame and quiet."
icon_state = "diyaab"
icon_living = "diyaab"
icon_dead = "diyaab_dead"
icon = 'icons/jungle.dmi'
@@ -95,5 +95,12 @@
// These ones only retaliate. Used for a PoI.
/mob/living/simple_mob/animal/sif/shantak/retaliate
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
/mob/living/simple_mob/animal/sif/shantak/retaliate
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
//Vorestation Addition
/mob/living/simple_mob/animal/sif/shantak/scruffy
name = "Scruffy"
ai_holder_type = /datum/ai_holder/simple_mob/passive
makes_dirt = 0
faction = "neutral"
+138 -36
View File
@@ -1051,12 +1051,11 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"cq" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm{
dir = 1;
pixel_y = -22
},
/turf/simulated/floor/plating,
/turf/simulated/floor,
/area/maintenance/lower/rnd)
"cr" = (
/obj/structure/railing{
@@ -1226,6 +1225,14 @@
/obj/effect/floor_decal/corner/mauve/border{
dir = 1
},
/obj/structure/table/rack,
/obj/item/weapon/rig/hazmat/equipped,
/obj/machinery/light_switch{
dir = 2;
name = "light switch ";
pixel_x = 0;
pixel_y = 36
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"cP" = (
@@ -4379,8 +4386,6 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/maintenance/lower/bar)
"jv" = (
/obj/structure/table/rack,
/obj/item/weapon/rig/hazmat/equipped,
/obj/effect/floor_decal/borderfloor{
dir = 8;
icon_state = "borderfloor";
@@ -4389,9 +4394,12 @@
/obj/effect/floor_decal/corner/mauve/border{
dir = 8
},
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
@@ -4453,7 +4461,7 @@
/area/rnd/rdoffice)
"jF" = (
/mob/living/simple_mob/slime/xenobio/rainbow/kendrick,
/turf/simulated/floor/tiled,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"jG" = (
/obj/effect/decal/cleanable/dirt,
@@ -5119,8 +5127,9 @@
/obj/machinery/photocopier/faxmachine{
department = "Research Director's Office"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
@@ -5429,10 +5438,10 @@
/obj/machinery/computer/skills{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"lG" = (
@@ -12575,6 +12584,28 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"yg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/obj/machinery/door/window/eastleft{
name = "Kendrick's Pen";
req_access = list(30);
req_one_access = list(19)
},
/obj/machinery/door/window/eastleft{
dir = 8;
icon_state = "left";
name = "Kendrick's Pen";
req_access = list(30);
req_one_access = list(19)
},
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"yi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12658,6 +12689,30 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/asmaint2)
"yr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"yw" = (
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/floor/plating,
/area/rnd/rdoffice)
"yx" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -13470,6 +13525,9 @@
"Bw" = (
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"BD" = (
/turf/simulated/floor,
/area/maintenance/lower/rnd)
"BH" = (
/obj/structure/catwalk,
/obj/random/junk,
@@ -16421,6 +16479,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"Jg" = (
/obj/machinery/light{
dir = 1
},
/obj/item/toy/plushie/farwa,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"Ji" = (
/turf/simulated/wall/r_wall,
/area/engineering/lower/lobby)
@@ -17068,6 +17133,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"MK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"MN" = (
/obj/effect/floor_decal/borderfloor/shifted{
icon_state = "borderfloor_shifted";
@@ -17765,6 +17840,19 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"PN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/alarm{
dir = 1;
pixel_y = -22
},
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"PP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18106,6 +18194,10 @@
/obj/structure/simple_door/wood,
/turf/simulated/floor/wood,
/area/maintenance/lower/atmos)
"RO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"RR" = (
/obj/structure/catwalk,
/obj/effect/floor_decal/rust,
@@ -18263,6 +18355,12 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/east_stairs_two)
"SQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"SV" = (
/obj/structure/bed/chair,
/obj/effect/floor_decal/rust,
@@ -19577,6 +19675,10 @@
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/wood,
/area/vacant/vacant_bar_upper)
"YV" = (
/obj/machinery/camera/network/research,
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"YX" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
@@ -26078,7 +26180,7 @@ ka
cM
ka
ka
kb
ka
ks
ks
ks
@@ -26218,9 +26320,9 @@ ho
jy
bz
cp
il
jy
jy
ii
ac
ac
ks
lk
lI
@@ -26358,11 +26460,11 @@ um
vO
ho
jy
jy
il
jy
jy
jy
BD
cF
cF
cF
cF
ks
ll
lM
@@ -26501,10 +26603,10 @@ hq
ho
jy
bz
il
jy
jy
jy
cF
YV
jF
SQ
ks
lm
ma
@@ -26643,10 +26745,10 @@ vW
vA
jx
bz
il
jy
jy
jy
cF
Jg
RO
PN
ks
lC
mb
@@ -26785,10 +26887,10 @@ hq
ho
jy
bz
il
cF
cF
cF
yw
yg
cF
cF
cF
@@ -26926,7 +27028,7 @@ hq
ho
ho
jy
jy
BD
cq
cF
cN
@@ -27072,7 +27174,7 @@ il
il
cF
cO
jE
MK
kK
lE
jE
@@ -27214,7 +27316,7 @@ il
bz
cF
dP
jE
yr
la
lF
md
@@ -27356,7 +27458,7 @@ bz
bz
cF
fQ
jF
jE
kq
lG
me
+36 -13
View File
@@ -11111,7 +11111,7 @@
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"aBg" = (
/obj/structure/flora/pottedplant/stoutbush,
/obj/structure/closet/secure_closet/engineering_chief,
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/chief)
"aBh" = (
@@ -11210,7 +11210,6 @@
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"aBr" = (
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -11220,6 +11219,7 @@
/obj/machinery/keycard_auth{
pixel_x = -28
},
/obj/machinery/photocopier,
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
"aBt" = (
@@ -15387,8 +15387,11 @@
pixel_x = 25;
pixel_y = 0
},
/obj/structure/closet/secure_closet/engineering_chief,
/turf/simulated/floor/tiled,
/obj/structure/window/reinforced{
dir = 1
},
/obj/item/weapon/reagent_containers/food/snacks/snakesnack,
/turf/simulated/floor/outdoors/grass/forest,
/area/crew_quarters/heads/chief)
"aTX" = (
/obj/machinery/computer/general_air_control{
@@ -15599,11 +15602,10 @@
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/chief)
"aVG" = (
/obj/machinery/light_switch{
dir = 1;
pixel_y = -24
/obj/structure/window/reinforced{
dir = 8
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/outdoors/grass/forest,
/area/crew_quarters/heads/chief)
"aVH" = (
/obj/effect/floor_decal/industrial/warning/corner{
@@ -15932,6 +15934,12 @@
/area/hallway/station/atrium)
"aYE" = (
/obj/structure/table/reinforced,
/obj/machinery/light_switch{
dir = 2;
name = "light switch ";
pixel_x = 10;
pixel_y = 36
},
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/chief)
"aYF" = (
@@ -17210,7 +17218,6 @@
/area/hallway/station/atrium)
"bfT" = (
/obj/structure/disposalpipe/segment,
/mob/living/simple_mob/animal/passive/snake/noodle,
/turf/simulated/floor/carpet/oracarpet,
/area/crew_quarters/heads/chief)
"bfW" = (
@@ -17490,6 +17497,11 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/alarm{
dir = 4;
pixel_x = -23;
pixel_y = 0
},
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/chief)
"bhr" = (
@@ -18976,7 +18988,6 @@
/turf/simulated/floor/tiled/monotile,
/area/bridge_hallway)
"bsO" = (
/obj/structure/table/reinforced,
/obj/machinery/power/apc{
dir = 2;
name = "south bump";
@@ -18986,6 +18997,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/machinery/papershredder,
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
"bsP" = (
@@ -19002,11 +19014,11 @@
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
"bsR" = (
/obj/structure/flora/pottedplant,
/obj/machinery/camera/network/command{
c_tag = "Head of Personnel Office";
dir = 9
},
/obj/structure/table/reinforced,
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
"bti" = (
@@ -22350,6 +22362,13 @@
/obj/random/junk,
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"klO" = (
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window/northleft,
/turf/simulated/floor/outdoors/grass/forest,
/area/crew_quarters/heads/chief)
"kCH" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -22493,6 +22512,10 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
"vyI" = (
/mob/living/simple_mob/animal/passive/snake/noodle,
/turf/simulated/floor/outdoors/grass/forest,
/area/crew_quarters/heads/chief)
"wlD" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -27979,7 +28002,7 @@ agc
aRV
aQh
aRV
aRV
klO
aVG
aRb
bYi
@@ -28122,7 +28145,7 @@ aZg
aQl
aSu
aTW
aBg
vyI
aRb
bYj
bYj
+82 -83
View File
@@ -16167,6 +16167,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/light_switch{
pixel_y = -26
},
/turf/simulated/floor/tiled,
/area/bridge/meeting_room)
"yO" = (
@@ -16868,29 +16871,6 @@
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"zH" = (
/obj/machinery/photocopier,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"zI" = (
/obj/machinery/alarm{
dir = 1;
icon_state = "alarm0";
pixel_y = -22
},
/obj/structure/table/woodentable,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"zJ" = (
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"zK" = (
/obj/machinery/light_switch{
pixel_y = -26
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"zL" = (
/obj/structure/cable/green{
d1 = 1;
@@ -20082,6 +20062,13 @@
},
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"Hg" = (
/obj/machinery/keycard_auth{
pixel_y = -28
},
/obj/structure/flora/pottedplant,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"Hq" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -20155,12 +20142,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"HU" = (
/obj/machinery/keycard_auth{
pixel_y = -28
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"Ik" = (
/obj/machinery/light/small{
dir = 8
@@ -20257,6 +20238,15 @@
/obj/structure/railing,
/turf/simulated/open,
/area/engineering/shaft)
"Jn" = (
/obj/machinery/alarm{
dir = 1;
icon_state = "alarm0";
pixel_y = -22
},
/obj/machinery/photocopier,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"Jp" = (
/obj/machinery/alarm{
dir = 4;
@@ -21154,6 +21144,10 @@
},
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"Ry" = (
/obj/structure/table/woodentable,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"RB" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -21324,6 +21318,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/white,
/area/maintenance/station/sec_lower)
"Tc" = (
/obj/machinery/light,
/obj/structure/filingcabinet/filingcabinet,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"Tj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
@@ -34758,7 +34757,7 @@ yN
wo
wo
wo
ac
wo
ac
aP
aP
@@ -34897,11 +34896,11 @@ xs
xK
ym
yO
wV
Ry
Ry
zG
wo
ac
ac
aP
aP
aP
aP
@@ -35040,10 +35039,10 @@ wV
yn
yO
wV
zH
wV
Ry
wo
ac
ac
aP
aP
aP
aP
@@ -35182,10 +35181,10 @@ wV
yn
yO
wV
zI
wV
Jn
wo
ac
ac
aP
aP
aP
aP
@@ -35324,10 +35323,10 @@ xL
yo
yP
xN
zJ
wV
Tc
wo
ac
ac
aP
aP
aP
aP
@@ -35466,10 +35465,10 @@ xM
yp
yQ
zc
zK
wV
wV
wo
ac
ac
aP
aP
aP
aP
@@ -35609,9 +35608,9 @@ yq
yR
zc
wV
wV
wo
ac
ac
aP
aP
aP
aP
@@ -35751,9 +35750,9 @@ yr
yS
xN
wV
wV
wo
ac
ac
aP
aP
aP
aP
@@ -35886,16 +35885,16 @@ pB
qg
vK
wo
wX
wV
wV
ys
wV
wV
HU
wV
wV
wV
wV
wo
ac
ac
aP
aP
aP
aP
@@ -36028,16 +36027,16 @@ uH
vk
vL
wo
wY
wY
wY
wY
wY
wY
wY
wX
wV
wV
ys
wV
wV
wV
Hg
wo
ac
ac
aP
aP
aP
aP
@@ -36170,6 +36169,15 @@ uI
tD
oY
oY
wY
wY
wY
wY
wY
wY
wY
wY
wo
aP
aP
aP
@@ -36178,15 +36186,6 @@ aP
aP
aP
aP
ac
ac
aP
aP
aP
aP
aP
aP
aP
aP
aP
aP
@@ -36320,8 +36319,8 @@ aP
aP
aP
aP
ac
ac
aP
aP
aP
aP
aP
@@ -36454,6 +36453,13 @@ uK
vl
oY
oY
aa
aa
aa
aa
aa
aa
aa
aP
aP
aP
@@ -36463,13 +36469,6 @@ aP
aP
aP
aP
ac
aP
aP
aP
aP
aP
aP
aP
aP
aP
@@ -36602,8 +36601,8 @@ aa
aa
aa
aa
aP
aP
aa
aa
aP
aP
aP
File diff suppressed because it is too large Load Diff