cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 06:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1140 from Fox-McCloud/tweaking-stuff

Browse Source 
Tweaks and Fixes 2.0
This commit is contained in:
ZomgPonies
2015-05-22 17:24:29 -04:00
parent 2d1b8f422e 1c1eec3210
commit c8f9aa0c33
17 changed files with 111 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/candle.dm
+5 -1
View File
@@ -74,4 +74,8 @@
if(lit)
lit = 0
update_icon()
set_light(0)
set_light(0)
/obj/item/candle/eternal
desc = "A candle. This one seems to have an odd quality about the wax."
wax = 10000
code/game/objects/items/weapons/cigs.dm
+3 -2
View File
@@ -290,8 +290,8 @@ LIGHTERS ARE IN LIGHTERS.DM
item_state = "pipeoff"
icon_on = "pipeon" //Note - these are in masks.dmi
icon_off = "pipeoff"
smoketime = 1000
chem_volume = 50
smoketime = 500
chem_volume = 200
/obj/item/clothing/mask/cigarette/pipe/New()
..()
@@ -334,6 +334,7 @@ LIGHTERS ARE IN LIGHTERS.DM
return
if(smoketime <= 0)
user << "<span class='notice'>You refill the pipe with tobacco.</span>"
reagents.add_reagent("nicotine", chem_volume)
smoketime = initial(smoketime)
return
code/game/objects/items/weapons/storage/fancy.dm
+12 -2
View File
@@ -91,12 +91,22 @@
slot_flags = SLOT_BELT
/obj/item/weapon/storage/fancy/candle_box/New()
/obj/item/weapon/storage/fancy/candle_box/full/New()
..()
for(var/i=1; i <= storage_slots; i++)
new /obj/item/candle(src)
return
/obj/item/weapon/storage/fancy/candle_box/eternal
name = "Eternal Candle pack"
desc = "A pack of red candles made with a special wax."
/obj/item/weapon/storage/fancy/candle_box/eternal/New()
..()
for(var/i=1; i <= storage_slots; i++)
new /obj/item/candle/eternal(src)
return
/*
* Crayon Box
*/
@@ -169,7 +179,7 @@
unlaced_cigarettes += C
for(var/R in default_reagents)
reagents.add_reagent(R, default_reagents[R])
/obj/item/weapon/storage/fancy/cigarettes/Destroy()
del(reagents)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+31
View File
@@ -50,4 +50,35 @@
new /obj/item/clothing/suit/armor/reactive(src)
new /obj/item/device/flash(src)
new /obj/item/device/laser_pointer(src)
return
/obj/structure/closet/secure_closet/research_reagents
name = "Research Chemical Storage Closet"
desc = "Store dangerous chemicals in here."
icon_state = "rchemical1"
icon_closed = "rchemical"
icon_locked = "rchemical1"
icon_opened = "medicalopen"
icon_broken = "rchemicalbroken"
icon_off = "rchemicaloff"
req_access = list(access_tox_storage)
New()
..()
sleep(2)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src)
new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src)
return
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+3 -2
View File
@@ -115,8 +115,9 @@
new /obj/item/clothing/suit/holidaypriest(src)
new /obj/item/clothing/under/wedding/bride_white(src)
new /obj/item/weapon/storage/backpack/cultpack (src)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
new /obj/item/weapon/storage/fancy/candle_box/eternal(src)
new /obj/item/clothing/gloves/ring/silver(src)
new /obj/item/clothing/gloves/ring/silver(src)
new /obj/item/clothing/gloves/ring/gold(src)
code/modules/reagents/Chemistry-Machinery.dm
+1 -1
View File
@@ -1027,7 +1027,7 @@
"soybeans" = list("soymilk" = 0),
"tomato" = list("ketchup" = 0),
///obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
"ricestalk" = list("rice" = -5),
"ricestalk" = list("rice" = 5),
"cherries" = list("cherryjelly" = 0),
"plastellium" = list("plasticide" = 5),
)
code/modules/reagents/Chemistry-Reagents.dm
+6
View File
@@ -2606,6 +2606,12 @@ datum
M:adjustToxLoss(1)
return
mojito
name = "Mojito"
id = "mojito"
description = "If it's good enough for Spesscuba, it's good enough for you."
color = "#664300" // rgb: 102, 67, 0
vodka
name = "Vodka"
id = "vodka"
code/modules/reagents/Chemistry-Recipes.dm
+7
View File
@@ -1118,6 +1118,13 @@ datum
required_reagents = list("rum" = 2, "cola" = 1)
result_amount = 3
mojito
name = "Mojito"
id = "mojito"
result = "mojito"
required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1)
result_amount = 4
martini
name = "Classic Martini"
id = "martini"
code/modules/reagents/reagent_containers/food/drinks.dm
+4
View File
@@ -242,6 +242,8 @@
New()
..()
reagents.add_reagent("tea", 30)
if(prob(20))
reagents.add_reagent("mugwort", 3)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
@@ -308,6 +310,8 @@
New()
..()
reagents.add_reagent("dry_ramen", 30)
if(prob(20))
reagents.add_reagent("enzyme", 3)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+8
View File
@@ -188,6 +188,14 @@
icon_state = "vermouthglass"
name = "Glass of Vermouth"
desc = "You wonder why you're even drinking this straight."
if("triple_citrus")
icon_state = "triplecitrus"
name = "Glass of Triplecitrus Juice"
desc = "As colorful and healthy as it is delicious."
if("mojito")
icon_state = "mojito"
name = "Glass of Mojito"
desc = "Fresh from Spesscuba."
if("tequilla")
icon_state = "tequillaglass"
name = "Glass of Tequilla"
code/modules/reagents/reagent_containers/food/snacks.dm
+2
View File
@@ -1279,6 +1279,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("fake_cheese", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein
@@ -1288,6 +1289,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("beans", 3)
reagents.add_reagent("msg",4)
bitesize = 2
code/modules/reagents/reagent_containers/glass/bottle.dm
+13
View File
@@ -252,6 +252,19 @@
..()
reagents.add_reagent("formaldehyde", 50)
/obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine
name = "Morphine Bottle"
desc = "A reagent bottle. Contains morphine."
New()
..()
reagents.add_reagent("morphine", 50)
/obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin
name = "Insulin Bottle"
desc = "A reagent bottle. Contains insulin."
New()
..()
reagents.add_reagent("insulin", 50)
////////////////////Traitor Poison Bottle//////////////////////////////
code/modules/store/items.dm
+1 -1
View File
@@ -72,7 +72,7 @@
/datum/storeitem/candle
name = "Candles"
desc = "A box of chandles. Use them to fool others into thinking you're out for a romantic dinner...or something."
typepath = /obj/item/weapon/storage/fancy/candle_box
typepath = /obj/item/weapon/storage/fancy/candle_box/full
cost = 200
/datum/storeitem/katana