cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 12:56:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Service Map Fixes (#16018)

Browse Source 
* Service Fixes

* Fix Wrong Way Disp. Pipe

* Freezer and Refrigerator Fixes

* Fix Chicken Map Icon

* Compatibility

* Typo

* Proper Chicken and Fish Freezer

* Remove Extra Hen
This commit is contained in:
SleepyGemmy
2023-03-23 23:59:30 +01:00
committed by GitHub
parent ed715fbb16
commit 1e34d71cc4
8 changed files with 1311 additions and 1592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barsign.dm
+33 -81
View File
@@ -1,54 +1,3 @@
/*
/obj/structure/sign/double/barsign
icon = 'icons/obj/barsigns.dmi'
icon_state = "empty"
anchored = 1
var/cult = 0
req_access = list(access_bar) //Has to initalize at first, this is updated by instance's req_access
/obj/structure/sign/double/barsign/proc/get_valid_states(initial=1)
. = icon_states(icon)
. -= "on"
. -= "narsiebistro"
. -= "empty"
if(initial)
. -= "Off"
/obj/structure/sign/double/barsign/examine(mob/user)
..()
switch(icon_state)
if("Off")
to_chat(user, "It appears to be switched off.")
if("narsiebistro")
to_chat(user, "It shows a picture of a large black and red being. Spooky!")
if("on", "empty")
to_chat(user, "The lights are on, but there's no picture.")
else
to_chat(user, "It says '[icon_state]'")
/obj/structure/sign/double/barsign/Initialize()
. = ..()
icon_state = pick(get_valid_states())
/obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user)
if(cult)
return ..()
var/obj/item/card/id/card = I.GetID()
if(istype(card))
if(check_access(card))
var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(0)
if(!sign_type)
return
icon_state = sign_type
to_chat(user, "<span class='notice'>You change the barsign.</span>")
else
to_chat(user, "<span class='warning'>Access denied.</span>")
return
return ..()
*/
/obj/structure/sign/double/barsign
icon = 'icons/obj/barsigns.dmi'
icon_state = "Off"
@@ -59,12 +8,6 @@
var/cult = 0
var/choice_types = /singleton/sign/double/bar
/obj/structure/sign/double/barsign/kitchensign
icon = 'icons/obj/kitchensigns.dmi'
icon_state = "Off"
req_access = list(access_kitchen)
choice_types = /singleton/sign/double/kitchen
/obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user)
if(cult)
return ..()
@@ -79,6 +22,38 @@
return ..()
/obj/structure/sign/double/barsign/proc/get_sign_choices()
var/list/sign_choices = GET_SINGLETON_SUBTYPE_MAP(choice_types)
return sign_choices
/obj/structure/sign/double/barsign/proc/set_sign()
var/list/sign_choices = get_sign_choices()
var/list/sign_index = list()
for(var/sign in sign_choices)
var/singleton/sign/double/B = GET_SINGLETON(sign)
sign_index["[B.name]"] = B
var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index
if(!sign_choice)
return
var/singleton/sign/double/signselect = sign_index[sign_choice]
name = signselect.name
desc = signselect.desc
desc_extended = signselect.desc_extended
icon_state = signselect.icon_state
update_icon()
/obj/structure/sign/double/barsign/kitchensign
icon = 'icons/obj/kitchensigns.dmi'
icon_state = "Off"
req_access = list(access_kitchen)
choice_types = /singleton/sign/double/kitchen
/obj/structure/sign/double/barsign/kitchensign/mirrored // Visible from the other end of the sign.
pixel_x = -32
/singleton/sign/double
var/name = "Holographic Projector"
var/icon_state = "Off"
@@ -185,27 +160,4 @@
name = "City Alive"
icon_state = "City Alive"
desc = "City Alive is another popular restaurant chain, originating from Eridani I. It is famous for its light shows."
desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit."
/obj/structure/sign/double/barsign/proc/get_sign_choices()
var/list/sign_choices = GET_SINGLETON_SUBTYPE_MAP(choice_types)
return sign_choices
/obj/structure/sign/double/barsign/proc/set_sign()
var/list/sign_choices = get_sign_choices()
var/list/sign_index = list()
for(var/sign in sign_choices)
var/singleton/sign/double/B = GET_SINGLETON(sign)
sign_index["[B.name]"] = B
var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index
if(!sign_choice)
return
var/singleton/sign/double/signselect = sign_index[sign_choice]
name = signselect.name
desc = signselect.desc
desc_extended = signselect.desc_extended
icon_state = signselect.icon_state
update_icon()
desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit."
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+37 -18
View File
@@ -1,31 +1,23 @@
//
// Freezer
//
/obj/structure/closet/secure_closet/freezer
name = "freezer"
desc = "A freezer."
icon_state = "freezer"
door_anim_squish = 0.22
door_anim_angle = 123
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
req_access = list(access_kitchen)
/obj/structure/closet/secure_closet/freezer/kitchen/fill()
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
req_access = list()
// Meat Freezer
/obj/structure/closet/secure_closet/freezer/meat
name = "meat fridge"
name = "meat freezer"
/obj/structure/closet/secure_closet/freezer/meat/fill()
..()
for(var/i = 0, i < 8, i++)
new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/reagent_containers/food/snacks/meat(src)
// this is enough meat to do 10 grill batches
/obj/structure/closet/secure_closet/freezer/meat/super_meat/fill()
/obj/structure/closet/secure_closet/freezer/meat/super_meat/fill() // This is enough meat to do 10 grill batches.
for(var/i = 0, i < 30, i++)
new /obj/item/reagent_containers/food/snacks/meat(src)
var/obj/item/reagent_containers/food/condiment/shaker/spacespice/SS = new(src)
@@ -38,8 +30,22 @@
P.pixel_x = 6
P.pixel_y = 8
// Chicken and Fish Freezer
/obj/structure/closet/secure_closet/freezer/chicken_and_fish
name = "chicken and fish freezer"
/obj/structure/closet/secure_closet/freezer/chicken_and_fish/fill()
..()
// 6 Chicken Fillets
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/snacks/meat/chicken(src)
// 6 Fish Fillets
for(var/i = 0, i < 6, i++)
new /obj/item/reagent_containers/food/snacks/fish/fishfillet(src)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
desc = "A refrigerator."
/obj/structure/closet/secure_closet/freezer/fridge/fill()
..()
@@ -50,6 +56,19 @@
for(var/i = 0, i < 2, i++)
new /obj/item/storage/box/fancy/egg_box(src)
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
desc = "A cabinet."
req_access = list(access_kitchen)
/obj/structure/closet/secure_closet/freezer/kitchen/fill()
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
req_access = list()
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
@@ -62,4 +81,4 @@
new /obj/random/spacecash(src)
for(var/i = 0, i < rand(6,9), i++)
new /obj/random/coin(src)
new /obj/random/coin(src)