cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-15 09:57:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

stunbatons aren't as harsh (and i moved oily oafs to it's own thing)

Browse Source
This commit is contained in:
eyespy
2023-04-04 02:01:06 +10:00
parent d2615de421
commit 8a93c57397
6 changed files with 6 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stunbaton.dm
+3 -3
View File
@@ -187,8 +187,8 @@
stunpwr *= round(stuncharge/hitcost, 0.1)
L.Knockdown(stunpwr)
L.adjustStaminaLoss(stunpwr*0.1, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented.
//L.Knockdown(stunpwr) GS13 change, makes stunbatons no longer oneshot people -Eye
L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented.
L.apply_effect(EFFECT_STUTTER, stunforce)
SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
if(user)
@@ -211,7 +211,7 @@
user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
user.Knockdown(stunforce*3)
//user.Knockdown(stunforce*3)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
deductcharge(hitcost)
code/modules/food_and_drinks/recipes/drinks_recipes.dm
-8
View File
@@ -917,11 +917,3 @@
id = /datum/reagent/consumable/orange_creamsicle
results = list(/datum/reagent/consumable/orange_creamsicle = 4)
required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/orangejuice = 1)
/datum/chemical_reaction/oily_oafs
name = "Oily oafs"
id = /datum/reagent/consumable/ethanol/oily_oafs
results = list(/datum/reagent/consumable/ethanol/oily_oafs = 2)
required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/cream = 1)
//b
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
-14
View File
@@ -2439,18 +2439,4 @@ datum/reagent/consumable/ethanol/creme_de_coconut
taste_description = "viscous cream"
glass_desc = "The name is probably exactly what it is."
///GS13 drinks!
/datum/reagent/consumable/ethanol/oily_oafs
name = "Oily oafs"
description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet."
color = "#ffc75f"
boozepwr = 30
taste_description = "rich butter and red sugar"
quality = DRINK_NICE
glass_icon_state = "oily_oafs"
glass_name = "oily oafs"
glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos."
shot_glass_icon_state = "shotglassbrown"
pH = 4.5
value = 0.1