cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks to the previous commits.

Browse Source
This commit is contained in:
Zuhayr
2015-12-01 02:14:47 +10:30
parent 1ea7aebb62
commit 7a8d88f5a9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mining/ore.dm
View File

@@ -39,6 +39,8 @@
H << "<span class='danger'>Some of \the [src] gets in your eyes!</span>" H << "<span class='danger'>Some of \the [src] gets in your eyes!</span>"
H.eye_blind += 5 H.eye_blind += 5
H.eye_blurry += 10 H.eye_blurry += 10
spawn(1)
if(istype(loc, /turf/)) qdel(src)
/obj/item/weapon/ore/phoron /obj/item/weapon/ore/phoron

2
code/modules/mob/living/carbon/human/unarmed_attack.dm
View File

@@ -247,7 +247,7 @@ var/global/list/sparring_attack_cache = list()
if(5) user.visible_message("<span class='danger'>[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!</span>") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ if(5) user.visible_message("<span class='danger'>[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!</span>") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/
/datum/unarmed_attack/light_strike /datum/unarmed_attack/light_strike
deal_halloss = 1 deal_halloss = 3
attack_noun = list("tap","light strike") attack_noun = list("tap","light strike")
attack_verb = list("tapped", "lightly struck") attack_verb = list("tapped", "lightly struck")
damage = 2 damage = 2

6
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -677,10 +677,8 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/soap(src) src.modules += new /obj/item/weapon/soap(src)
src.modules += new /obj/item/weapon/extinguisher(src) src.modules += new /obj/item/weapon/extinguisher(src)
src.modules += new/obj/item/weapon/tank/jetpack/carbondioxide(src) robot.internals = new/obj/item/weapon/tank/jetpack/carbondioxide(src)
for(var/obj/item/weapon/tank/jetpack/carbondioxide in src.modules) src.modules += robot.internals
robot.internals = src
break
src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
src.emag.name = "Plasma Cutter" src.emag.name = "Plasma Cutter"