cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-19 19:52:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1462 from Chemlight/GIRTH

Browse Source 
No more 2D Girth
This commit is contained in:
Dahlular
2021-10-29 06:31:10 -06:00
committed by GitHub
parent 3e081a798f 48715ddc3a
commit 97f3d419a9
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/vampire.dm
+19 -2
View File
@@ -25,7 +25,7 @@
to_chat(C, "[info_text]")
C.skin_tone = "albino"
C.update_body(0)
var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/B = new
var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/vampire/B = new
C.AddSpell(B)
/datum/species/vampire/on_species_loss(mob/living/carbon/C)
@@ -33,7 +33,7 @@
if(C.mind)
for(var/S in C.mind.spell_list)
var/obj/effect/proc_holder/spell/S2 = S
if(S2.type == /obj/effect/proc_holder/spell/targeted/shapeshift/bat)
if(S2.type == /obj/effect/proc_holder/spell/targeted/shapeshift/bat/vampire)
C.mind.spell_list.Remove(S2)
qdel(S2)
@@ -135,6 +135,9 @@
var/ventcrawl_nude_only = TRUE
var/transfer_name = TRUE
/obj/effect/proc_holder/spell/targeted/shapeshift/bat/vampire
shapeshift_type = /mob/living/simple_animal/hostile/retaliate/bat/vampire
/obj/effect/proc_holder/spell/targeted/shapeshift/bat/Shapeshift(mob/living/caster) //cit change
var/obj/shapeshift_holder/H = locate() in caster
if(H)
@@ -152,3 +155,17 @@
clothes_req = 0
human_req = 0
/obj/effect/proc_holder/spell/targeted/shapeshift/bat/vampire/Shapeshift(mob/living/caster) //cit change
var/obj/shapeshift_holder/H = locate() in caster
if(H)
to_chat(caster, "<span class='warning'>You're already shapeshifted!</span>")
return
var/mob/living/shape = new shapeshift_type(caster.loc)
H = new(shape,src,caster)
if(transfer_name)
H.name = caster.name
clothes_req = 0
human_req = 0
code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+3
View File
@@ -49,3 +49,6 @@
emote_see = list("is ready to law down the law.", "flaps about with an air of authority.")
response_help = "respects the authority of"
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/hostile/retaliate/bat/vampire //Too many people use this to vent into places they shouldn't, *cough cough* armory
ventcrawler = VENTCRAWLER_NONE