mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.
Reason: Compile Error, hung server. Damnit Cael.
This commit is contained in:
@@ -2749,47 +2749,12 @@ datum
|
||||
color = "#664300" // rgb: 102, 67, 0
|
||||
dizzy_adj = 3
|
||||
|
||||
absinthe
|
||||
name = "Absinthe"
|
||||
id = "absinthe"
|
||||
description = "Watch out that the Green Fairy doesn't come for you!"
|
||||
color = "#33EE00" // rgb: lots, ??, ??
|
||||
dizzy_adj = 5
|
||||
slur_start = 25
|
||||
confused_start = 100
|
||||
|
||||
//copy paste from LSD... shoot me
|
||||
on_mob_life(var/mob/M)
|
||||
if(!M) M = holder.my_atom
|
||||
if(!data) data = 1
|
||||
data++
|
||||
M:hallucination += 5
|
||||
if(volume > REAGENTS_OVERDOSE)
|
||||
M:adjustToxLoss(1)
|
||||
// if(data >= 100)
|
||||
// M:adjustToxLoss(0.1)
|
||||
..()
|
||||
return
|
||||
|
||||
rum
|
||||
name = "Rum"
|
||||
id = "rum"
|
||||
description = "Yohoho and all that."
|
||||
color = "#664300" // rgb: 102, 67, 0
|
||||
|
||||
deadrum
|
||||
name = "Deadrum"
|
||||
id = "rum"
|
||||
description = "Popular with the sailors. Not very popular with everyone else."
|
||||
color = "#664300" // rgb: 102, 67, 0
|
||||
|
||||
on_mob_life(var/mob/living/M as mob)
|
||||
..()
|
||||
M.dizziness +=5
|
||||
if(volume > REAGENTS_OVERDOSE)
|
||||
M:adjustToxLoss(1)
|
||||
return
|
||||
|
||||
vodka
|
||||
name = "Vodka"
|
||||
id = "vodka"
|
||||
|
||||
@@ -3009,14 +3009,6 @@
|
||||
..()
|
||||
reagents.add_reagent("rum", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/deadrum
|
||||
name = "Deadrum Bumbo"
|
||||
desc = "Tastes a lot sweeter than ordinary rum (that's to help disguise the kick)."
|
||||
icon_state = "deadrumbottle"
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("deadrum", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater
|
||||
name = "Flask of Holy Water"
|
||||
desc = "A flask of the chaplain's holy water."
|
||||
@@ -3065,14 +3057,6 @@
|
||||
..()
|
||||
reagents.add_reagent("wine", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe
|
||||
name = "Jailbreaker Verte"
|
||||
desc = "Twenty-fourth century Green Fairy, one sip of this and you just know you're gonna have a good time."
|
||||
icon_state = "absinthebottle"
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("absinthe", 100)
|
||||
|
||||
//////////////////////////JUICES AND STUFF ///////////////////////
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
//if it's a crate, move the item into the crate
|
||||
var/turf/T = get_step(A,movedir)
|
||||
for(var/obj/structure/closet/crate/C in T)
|
||||
if(C && C.opened && !istype(A, /obj/structure/closet/crate))
|
||||
if(C && C.opened)
|
||||
A.loc = C.loc
|
||||
break
|
||||
|
||||
|
||||
Reference in New Issue
Block a user