cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-10 07:45:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #422 from Shadowfire117/goiaanddrinks

Browse Source 
Casino updoot!
This commit is contained in:
Razgriz
2020-07-23 13:34:00 -07:00
committed by GitHub
parent 8a66fef929 7fc2c5e092
commit 5fe45fc4d6
14 changed files with 369 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc_ch.dm
+24 -1
View File
@@ -19,4 +19,27 @@
icon_state = "wahcap"
item_state_slots = list(slot_r_hand_str = "wahcap", slot_l_hand_str = "wahcap")
icon = 'icons/obj/clothing/hats_ch.dmi'
icon_override = 'icons/mob/head_ch.dmi'
icon_override = 'icons/mob/head_ch.dmi'
/obj/item/clothing/head/crown //Generic crown doesnt exist, no sprites
icon = 'icons/obj/clothing/hats_ch.dmi'
icon_override = 'icons/mob/head_ch.dmi'
icon_state = "crown"
item_state = "crown"
name = "crown"
desc = "A crown, it's pretty."
body_parts_covered = 0
/obj/item/clothing/head/crown/goose_king
name = "Crown of the golden goose king"
desc = "It's the crown given to the goose king from the golden goose casino, what an honor!"
icon_state = "goose_king"
item_state = "goose_king"
/obj/item/clothing/head/crown/goose_queen
name = "Crown of the golden goose queen"
desc = "It's the crown given to the goose queen from the golden goose casino, what an honor!"
icon_state = "goose_queen"
item_state = "goose_queen"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_ch.dm
+23 -23
View File
@@ -546,15 +546,35 @@
return
M.adjustToxLoss(-0.5 * removed)
/datum/reagent/drink/highpower
name = "The High power"
id = "highpower"
description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights."
taste_description = "copper, ozone, and pain"
color = "#a2f563"
glass_name = "highpower"
glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights."
/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
if(prob(5))
M.say("!skin's crackles with energy and seems to be in pain.")
M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",30)
M.AdjustWeakened(3) //Getting sapped makes the victim fall
M.Stun(3)
M.add_chemical_effect(CE_SPEEDBOOST, 1)
/datum/reagent/ethanol/coffee/jackbrew
name = "\improper Jack's brew"
name = "Rush hour"
id = "jackbrew"
description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job."
taste_description = "wishing you could give up on the day"
color = "#4C3100"
strength = 15
glass_name = "Jack's brew"
glass_name = "Rush hour"
glass_desc = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job."
/datum/reagent/ethanol/coffee/jackbrew/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -566,7 +586,7 @@
M.nutrition = (M.nutrition - (removed * 2)) //Sadly this movement starts burning food in higher doses.
..()
if(prob(5))
M.emote(pick("twitch", "blink_r", "shiver", "weh"))
M.emote(pick("twitch", "blink_r", "shiver", "weh", "weh", "weh")) // weh - Jack
M.add_chemical_effect(CE_SPEEDBOOST, 1)
/datum/reagent/ethanol/bookwyrm
@@ -618,26 +638,6 @@
M.sleeping = max(M.sleeping, 20)
M.drowsyness = max(M.drowsyness, 60)
/datum/reagent/drink/highpower
name = "The High power"
id = "highpower"
description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights."
taste_description = "copper, ozone, and pain"
color = "#a2f563"
glass_name = "highpower"
glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights."
/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
if(prob(5))
M.say("!skin's crackles with energy and seems to be in pain.")
M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",30)
M.AdjustWeakened(3) //Getting sapped makes the victim fall
M.Stun(3)
M.add_chemical_effect(CE_SPEEDBOOST, 1)
/datum/reagent/ethanol/flapper
name = "Flapper"
id = "flapper"