Skip to content

Commit

Permalink
botanist removal + cards
Browse files Browse the repository at this point in the history
  • Loading branch information
Sadhorizon committed Apr 6, 2024
1 parent ec68c3f commit e4af7ca
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 24 deletions.
4 changes: 0 additions & 4 deletions _maps/configs/independent_sunskipper.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
"outfit": "/datum/outfit/job/independent/cook",
"slots": 2
},
"Botanist": {
"outfit": "/datum/outfit/job/independent/botanist",
"slots": 1
},
"Waiter": {
"outfit": "/datum/outfit/job/independent/assistant/waiter",
"slots": 2
Expand Down
62 changes: 42 additions & 20 deletions _maps/shuttles/independent/independent_sunskipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
color = "#792f27";
dir = 9
},
/obj/item/radio/intercom/wideband/directional/west,
/obj/machinery/button/door{
pixel_x = -10;
pixel_y = 22;
Expand All @@ -189,7 +190,6 @@
name = "Crew Area Shutters Control";
id = "sunskipper_crew_shutters"
},
/obj/item/radio/intercom/wideband/directional/west,
/obj/machinery/button/door{
pixel_x = 10;
pixel_y = 22;
Expand Down Expand Up @@ -393,6 +393,8 @@
/obj/item/seeds/cocoapod,
/obj/item/seeds/grape,
/obj/item/seeds/soya,
/obj/item/seeds/coffee,
/obj/item/seeds/tea,
/turf/open/floor/plasteel/mono/dark,
/area/ship/crew/hydroponics)
"ex" = (
Expand Down Expand Up @@ -529,16 +531,15 @@
},
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen)
"gA" = (
/obj/machinery/smartfridge/food,
/turf/open/floor/plasteel/mono,
/area/ship/crew/canteen/kitchen)
"gE" = (
/obj/machinery/firealarm/directional/north,
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/condiment/soysauce{
pixel_x = -6
},
/obj/item/reagent_containers/food/condiment/bbqsauce{
pixel_x = 6
},
/obj/item/radio/intercom/directional/west,
/obj/machinery/jukebox/boombox,
/turf/open/floor/plasteel/mono,
/area/ship/crew/canteen/kitchen)
"gU" = (
Expand Down Expand Up @@ -1755,7 +1756,12 @@
dir = 1;
color = "#543C30"
},
/obj/item/clothing/mask/vape/cigar,
/obj/item/clothing/mask/vape/cigar{
pixel_y = -2
},
/obj/item/toy/cards/deck/kotahi{
pixel_y = -14
},
/turf/open/floor/wood/mahogany,
/area/ship/crew/canteen)
"xT" = (
Expand Down Expand Up @@ -2012,6 +2018,7 @@
/obj/structure/safe,
/obj/item/reagent_containers/food/drinks/bottle/moonshine,
/obj/item/spacecash/bundle/c1000,
/obj/item/gun/energy/e_gun/mini,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"AR" = (
Expand Down Expand Up @@ -2162,14 +2169,14 @@
/area/ship/crew/canteen)
"CM" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck/cas{
pixel_y = 8;
pixel_x = 10
},
/obj/item/flashlight/lamp/green{
pixel_x = -5;
pixel_y = 3
},
/obj/item/clothing/head/fedora{
pixel_x = 12;
pixel_y = 6
},
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/crew/dorm)
"CQ" = (
Expand Down Expand Up @@ -2583,6 +2590,10 @@
},
/obj/item/pen,
/obj/machinery/newscaster/directional/east,
/obj/item/toy/cards/deck/cas/black{
pixel_y = 8;
pixel_x = -10
},
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/crew/dorm)
"Id" = (
Expand Down Expand Up @@ -2888,6 +2899,10 @@
/obj/structure/sign/poster/contraband/borg_fancy_1{
pixel_y = -32
},
/obj/item/fish_feed{
pixel_y = 5;
pixel_x = 1
},
/turf/open/floor/plasteel/mono,
/area/ship/crew/canteen/kitchen)
"Mj" = (
Expand Down Expand Up @@ -3409,10 +3424,10 @@
/obj/effect/turf_decal/box,
/obj/item/radio/intercom/directional/east,
/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
/obj/item/reagent_containers/food/snacks/meat/slab/bear,
/obj/item/reagent_containers/food/snacks/meat/slab/chicken,
/obj/item/reagent_containers/food/snacks/meat/slab/chicken,
/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen/kitchen)
"Ug" = (
Expand Down Expand Up @@ -3522,6 +3537,7 @@
pixel_x = -11;
dir = 1
},
/obj/item/reagent_containers/spray/pepper,
/turf/open/floor/carpet/black,
/area/ship/hallway/central)
"Vm" = (
Expand Down Expand Up @@ -3558,9 +3574,13 @@
"VG" = (
/obj/machinery/light/directional/west,
/obj/structure/table/reinforced,
/obj/item/fish_feed{
pixel_y = 5;
pixel_x = 1
/obj/item/reagent_containers/food/condiment/soysauce{
pixel_x = -6;
pixel_y = 8
},
/obj/item/reagent_containers/food/condiment/bbqsauce{
pixel_x = 6;
pixel_y = 8
},
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
Expand Down Expand Up @@ -3648,6 +3668,10 @@
dir = 4;
color = "#543C30"
},
/obj/item/toy/cards/deck/syndicate{
pixel_y = 2;
pixel_x = -1
},
/turf/open/floor/wood/mahogany,
/area/ship/crew/canteen)
"Xm" = (
Expand Down Expand Up @@ -3757,11 +3781,9 @@
name = "Manager's Locker"
},
/obj/item/clipboard,
/obj/item/gun/energy/e_gun/mini,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/laceup,
/obj/item/reagent_containers/spray/pepper,
/obj/item/clothing/under/suit/black_really,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
Expand Down Expand Up @@ -4147,7 +4169,7 @@ Nk
HG
OS
eK
vH
gA
Xz
ds
By
Expand Down

0 comments on commit e4af7ca

Please sign in to comment.