mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
A bunch of smaller bugfixes (#22618)
Fixes: - https://github.com/Aurorastation/Aurora.3/issues/22592 - https://github.com/Aurorastation/Aurora.3/issues/22369 - https://github.com/Aurorastation/Aurora.3/issues/22398 - https://github.com/Aurorastation/Aurora.3/issues/22358 - https://github.com/Aurorastation/Aurora.3/issues/22432 - https://github.com/Aurorastation/Aurora.3/issues/22591 - https://github.com/Aurorastation/Aurora.3/issues/22411 - And the sound when putting items into metal briefcases, crime scene kits and pill bottles - As well as the sprites for the two boonie hats for taj
This commit is contained in:
@@ -124,7 +124,8 @@ FOODSTUFFS
|
||||
/singleton/biorecipe/food/bio_vitamin
|
||||
name = "Flavored Vitamin"
|
||||
object = /obj/item/reagent_containers/pill/bio_vitamin
|
||||
amount = list(1,5,10,25,50)
|
||||
// Pill bottles can at most hold 14 pills
|
||||
amount = list(1,3,5,10,14)
|
||||
|
||||
/singleton/biorecipe/food/liquidfood
|
||||
name = "Food Ration"
|
||||
|
||||
@@ -1089,13 +1089,13 @@ About the new airlock wires panel:
|
||||
stripe_overlay = new(stripe_file)
|
||||
stripe_overlay.Blend(stripe_color, ICON_MULTIPLY)
|
||||
SSicon_cache.airlock_icon_cache["[ikey]"] = stripe_overlay
|
||||
if(!glass)
|
||||
var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe"
|
||||
stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"]
|
||||
if(!stripe_filling_overlay)
|
||||
stripe_filling_overlay = new(stripe_fill_file)
|
||||
stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY)
|
||||
SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay
|
||||
|
||||
var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe"
|
||||
stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"]
|
||||
if(!stripe_filling_overlay)
|
||||
stripe_filling_overlay = new(stripe_fill_file)
|
||||
stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY)
|
||||
SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay
|
||||
|
||||
if(arePowerSystemsOn())
|
||||
switch(state)
|
||||
|
||||
@@ -90,8 +90,7 @@
|
||||
if(href_list["read"])
|
||||
var/obj/item/paper/P = locate(href_list["read"])
|
||||
if((P && P.loc == src))
|
||||
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[P.info]</TT></BODY></HTML>", "window=[P.name]")
|
||||
onclose(usr, "[P.name]")
|
||||
P.show_content(usr)
|
||||
return
|
||||
|
||||
/obj/structure/noticeboard/command
|
||||
|
||||
Reference in New Issue
Block a user