shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11440 from kevinz000/master_fix

Browse Source 
fixes master
This commit is contained in:
Ghom
2020-03-12 01:54:15 +01:00
committed by GitHub
parent fa160d4c3a dbc54ab699
commit 88bdc6d068
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/components.dm
+1 -1
View File
@@ -291,7 +291,7 @@
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" //from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
#define COMSIG_HUMAN_DISARM_HIT "human_disarm_hit" //Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted)
#define COMSIG_HUMAN_PREFS_COPIED_TO "human_prefs_copied_to" //from datum/preferences/copy_to(): (datum/preferences, icon_updates, roundstart_checks)
#define COMSIG_HUMAN_HARDSET_DNA "human_hardset_dna" //from mob/living/carbon/human/hardset_dna(): (ui, se, newreal_name, newblood_type, datum/species, newfeatures)
#define COMSIG_HUMAN_HARDSET_DNA "human_hardset_dna" //from mob/living/carbon/human/hardset_dna(): (ui, list/mutation_index, newreal_name, newblood_type, datum/species, newfeatures)
#define COMSIG_HUMAN_ON_RANDOMIZE "humman_on_randomize" //from base of proc/randomize_human()
// /datum/species signals
code/datums/dna.dm
+1 -1
View File
@@ -390,7 +390,7 @@
dna.mutation_index = mutation_index.Copy()
domutcheck()
SEND_SIGNAL(src, COMSIG_HUMAN_HARDSET_DNA, ui, se, newreal_name, newblood_type, mrace, newfeatures)
SEND_SIGNAL(src, COMSIG_HUMAN_HARDSET_DNA, ui, mutation_index, newreal_name, newblood_type, mrace, newfeatures)
if(mrace || newfeatures || ui)
update_body()
code/datums/mutations/actions.dm
+2 -2
View File
@@ -171,7 +171,7 @@
return
if(iscarbon(target))
var/mob/living/carbon/C = target
if(C.electrocute_act(15, user, 1, stun = 0))//doesnt stun. never let this stun
if(C.electrocute_act(15, user, 1, SHOCK_NOSTUN))//doesnt stun. never let this stun
C.dropItemToGround(C.get_active_held_item())
C.dropItemToGround(C.get_inactive_held_item())
C.confused += 10
@@ -182,7 +182,7 @@
return ..()
else if(isliving(target))
var/mob/living/L = target
L.electrocute_act(15, user, 1, stun = 0)
L.electrocute_act(15, user, 1, SHOCK_NOSTUN)
L.visible_message("<span class='danger'>[user] electrocutes [target]!</span>","<span class='userdanger'>[user] electrocutes you!</span>")
return ..()
else