cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

radstorm changes and borg module fixes

Browse Source
This commit is contained in:
Kashargul
2023-12-06 19:41:28 +01:00
committed by GitHub
parent c3afd8f6bd
commit ef99260164
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/radiation_storm.dm
+5 -1
View File
@@ -34,6 +34,8 @@
SSradiation.z_radiate(locate(1, 1, z), radiation_level, 1)
for(var/mob/living/carbon/C in living_mob_list)
if(!(C.z in using_map.station_levels) || C.isSynthetic() || isbelly(C.loc))
continue
var/area/A = get_area(C)
if(!A)
continue
@@ -41,7 +43,9 @@
continue
if(istype(C,/mob/living/carbon/human))
var/mob/living/carbon/human/H = C
if(prob(5))
var/chance = 5.0
chance -= (chance / 100) * C.getarmor(null, "rad")
if(prob(chance))
if (prob(75))
randmutb(H) // Applies bad mutation
domutcheck(H,null,MUTCHK_FORCED)
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+11 -2
View File
@@ -237,6 +237,7 @@
icon_state = "synthtongue"
hitsound = 'sound/effects/attackblob.ogg'
var/emagged = 0
var/busy = 0 //prevents abuse and runtimes
/obj/item/device/robot_tongue/New()
..()
@@ -263,21 +264,27 @@
return
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(busy)
to_chat(user, "<span class='warning'>You are already licking something else.</span>")
return
if(user.client && (target in user.client.screen))
to_chat(user, "<span class='warning'>You need to take \the [target.name] off before cleaning it!</span>")
return
else if(istype(target,/obj/item))
if(istype(target,/obj/item/trash))
user.visible_message("<span class='filter_notice'>[user] nibbles away at \the [target.name].</span>", "<span class='notice'>You begin to nibble away at \the [target.name]...</span>")
busy = 1
if(do_after (user, 50))
user.visible_message("<span class='filter_notice'>[user] finishes eating \the [target.name].</span>", "<span class='notice'>You finish eating \the [target.name].</span>")
to_chat(user, "<span class='notice'>You finish off \the [target.name].</span>")
qdel(target)
var/mob/living/silicon/robot/R = user
R.cell.charge += 250
busy = 0
return
if(istype(target,/obj/item/weapon/cell))
user.visible_message("<span class='filter_notice'>[user] begins cramming \the [target.name] down its throat.</span>", "<span class='notice'>You begin cramming \the [target.name] down your throat...</span>")
busy = 1
if(do_after (user, 50))
user.visible_message("<span class='filter_notice'>[user] finishes gulping down \the [target.name].</span>", "<span class='notice'>You finish swallowing \the [target.name].</span>")
to_chat(user, "<span class='notice'>You finish off \the [target.name], and gain some charge!</span>")
@@ -285,6 +292,7 @@
var/obj/item/weapon/cell/C = target
R.cell.charge += C.charge / 3
qdel(target)
busy = 0
return
else if(ishuman(target))
if(src.emagged)
@@ -345,7 +353,8 @@
icon = 'icons/mob/dogborg_vr.dmi'
icon_state = "swordtail"
desc = "A glowing dagger. It appears to be extremely sharp."
force = 20 //Takes 5 hits to 100-0
force = 35 //Takes 3 hits to 100-0
armor_penetration = 70
sharp = TRUE
edge = TRUE
throwforce = 0 //This shouldn't be thrown in the first place.
@@ -466,4 +475,4 @@
var/armor_soak = get_armor_soak(T, "melee")
T.apply_damage(20, HALLOSS,, armor_block, armor_soak)
if(prob(75)) //75% chance to stun for 5 seconds, really only going to be 4 bcus click cooldown+animation.
T.apply_effect(5, WEAKEN, armor_block)
T.apply_effect(5, WEAKEN, armor_block)