-Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new Midnight UI scheme are now found in screen1_Orange.dmi and screen1_Midnight.dmi, respectively.
-Driest Martinis will no longer be invisible. -Braincakes are now able to be cut into slices. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3641 316c924e-a436-60f5-8080-3fe189b3f50e
@@ -3355,7 +3355,7 @@
|
|||||||
name = "Erika Surprise"
|
name = "Erika Surprise"
|
||||||
desc = "The surprise is, it's green!"
|
desc = "The surprise is, it's green!"
|
||||||
if("driestmartini")
|
if("driestmartini")
|
||||||
icon_state = "driestmartini"
|
icon_state = "driestmartiniglass"
|
||||||
name = "Driest Martini"
|
name = "Driest Martini"
|
||||||
desc = "Only for the experienced. You think you see sand floating in the glass."
|
desc = "Only for the experienced. You think you see sand floating in the glass."
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1355,16 +1355,6 @@
|
|||||||
reagents.add_reagent("metroid", 5)
|
reagents.add_reagent("metroid", 5)
|
||||||
bitesize = 3
|
bitesize = 3
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/braincake
|
|
||||||
name = "Brain Cake"
|
|
||||||
desc = "A squishy cake-thing."
|
|
||||||
icon_state = "braincake"
|
|
||||||
New()
|
|
||||||
..()
|
|
||||||
reagents.add_reagent("nutriment", 8)
|
|
||||||
reagents.add_reagent("alkysine", 8)
|
|
||||||
bitesize = 3
|
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/mint
|
/obj/item/weapon/reagent_containers/food/snacks/mint
|
||||||
name = "mint"
|
name = "mint"
|
||||||
desc = "it is only wafer thin."
|
desc = "it is only wafer thin."
|
||||||
@@ -1529,6 +1519,24 @@
|
|||||||
trash = "plate"
|
trash = "plate"
|
||||||
bitesize = 2
|
bitesize = 2
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
|
||||||
|
name = "Brain Cake"
|
||||||
|
desc = "A squishy cake-thing."
|
||||||
|
icon_state = "braincake"
|
||||||
|
slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice
|
||||||
|
slices_num = 5
|
||||||
|
New()
|
||||||
|
..()
|
||||||
|
reagents.add_reagent("nutriment", 25)
|
||||||
|
reagents.add_reagent("alkysine", 10)
|
||||||
|
bitesize = 2
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice
|
||||||
|
name = "Brain Cake slice"
|
||||||
|
desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
|
||||||
|
icon_state = "braincakeslice"
|
||||||
|
bitesize = 2
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
|
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
|
||||||
name = "Cheese Cake"
|
name = "Cheese Cake"
|
||||||
desc = "DANGEROUSLY cheesy."
|
desc = "DANGEROUSLY cheesy."
|
||||||
|
|||||||
@@ -1052,9 +1052,9 @@
|
|||||||
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
/obj/item/weapon/reagent_containers/food/snacks/egg,
|
||||||
/mob/living/carbon/brain,
|
/obj/item/brain
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/braincake
|
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
|
||||||
|
|
||||||
/datum/recipe/chocolateegg
|
/datum/recipe/chocolateegg
|
||||||
items = list(
|
items = list(
|
||||||
|
|||||||
@@ -46,6 +46,15 @@ Stuff which is in development and not yet visible to players or just code relate
|
|||||||
should be listed in the changelog upon commit tho. Thanks. -->
|
should be listed in the changelog upon commit tho. Thanks. -->
|
||||||
|
|
||||||
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
|
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
|
||||||
|
<div class="commit sansserif">
|
||||||
|
<h2 class="date">May 22</h2>
|
||||||
|
<h3 class="author">Cheridan updated:</h3>
|
||||||
|
<ul class="changes bgimages16">
|
||||||
|
<li class="rscadd">-Reverted default UI sprites to Erro's old-style UI. Config options for UI color styles coming soon. -Driest Martinis will no longer be invisible. -Braincakes are now sliceable.</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="commit sansserif">
|
<div class="commit sansserif">
|
||||||
<h2 class="date">Tuesday, May 22</h2>
|
<h2 class="date">Tuesday, May 22</h2>
|
||||||
<h3 class="author">Icarus updated:</h3>
|
<h3 class="author">Icarus updated:</h3>
|
||||||
|
|||||||
BIN
icons/mob/screen1_Midnight.dmi
Normal file
|
After Width: | Height: | Size: 140 KiB |
BIN
icons/mob/screen1_Orange.dmi
Normal file
|
After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 108 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |