some fixes!

some fixes!
This commit is contained in:
QuoteFox
2021-03-20 16:32:29 +00:00
parent 706ee6d3eb
commit 0c5effbc7b
8 changed files with 12 additions and 10 deletions
+2 -2
View File
@@ -259,8 +259,8 @@
#define POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets
#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you
#define HUNGER_FACTOR 0.08 //factor at which mob nutrition decreases
#define THIRST_FACTOR 0.08 //factor at which mob thirst decreases
#define HUNGER_FACTOR 0.03 //factor at which mob nutrition decreases
#define THIRST_FACTOR 0.03 //factor at which mob thirst decreases
#define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default.
#define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism
+1 -1
View File
@@ -273,7 +273,7 @@
icon_state = "telebaton_1"
item_state = "nullrod"
w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
force = 10 //stunbaton damage
force = 50 //stunbaton damage
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
to_chat(user, "<span class ='notice'>You collapse the baton.</span>")
@@ -427,10 +427,10 @@
output += "<br>...?"
else
. += "[print_flavor_text()]"
output += "<br>[replacetext(sanitize(html_decode(flavor_text)), "#", "<p>")]"
output += "<br>[url_encode(json_encode(flavor_text))]"
if(ooc_text)
output += "<br><br><i><b>OOC</b>"
output += "<br>[replacetext(sanitize(html_decode(ooc_text)), "#", "<p>")]"
output += "<br>[url_encode(json_encode(ooc_text))]"
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
. += "*---------*</span>"
@@ -24,4 +24,4 @@
e_cost = 40
fire_sound = 'sound/weapons/taser2.ogg'
harmful = FALSE
click_cooldown_override = 3.5
click_cooldown_override = 4
+1 -1
View File
@@ -69,7 +69,7 @@
/obj/item/projectile/beam/disabler
name = "disabler beam"
icon_state = "omnilaser"
damage = 24 // Citadel change for balance from 36
damage = 35 // Citadel change for balance from 36
damage_type = STAMINA
flag = "energy"
hitsound = 'sound/weapons/tap.ogg'