cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #199 from TheDZD/minor-fixes

Browse Source 
Vampire and Borer Patch [Redy to Merge]
This commit is contained in:
Fox-McCloud
2015-01-20 17:55:09 -05:00
parent bec19f6abf cfc06d13dd
commit 062b8632cb
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/vampire/vampire.dm
+19 -13
View File
@@ -462,6 +462,24 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
if(T.density)
return
vamp_burn()
/mob/living/carbon/human/proc/handle_vampire()
if(hud_used)
if(!hud_used.vampire_blood_display)
hud_used.vampire_hud()
hud_used.human_hud('icons/mob/screen1_Vampire.dmi')
hud_used.vampire_blood_display.maptext_width = 64
hud_used.vampire_blood_display.maptext_height = 26
hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> U:<font color='#33FF33' size='1'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00' size='1'>[mind.vampire.bloodtotal]</font></div>"
handle_vampire_cloak()
if(istype(loc, /turf/space))
check_sun()
if(istype(loc.loc, /area/chapel) && !(VAMP_FULL in src.mind.vampire.powers))
vamp_burn()
mind.vampire.nullified = max(0, mind.vampire.nullified - 1)
mob/living/carbon/human/proc/vamp_burn()
if(prob(35))
switch(health)
if(80 to 100)
@@ -482,16 +500,4 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
fire_stacks++
IgniteMob()
adjustFireLoss(3)
/mob/living/carbon/human/proc/handle_vampire()
if(hud_used)
if(!hud_used.vampire_blood_display)
hud_used.vampire_hud()
hud_used.human_hud('icons/mob/screen1_Vampire.dmi')
hud_used.vampire_blood_display.maptext_width = 64
hud_used.vampire_blood_display.maptext_height = 26
hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> U:<font color='#33FF33' size='1'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00' size='1'>[mind.vampire.bloodtotal]</font></div>"
handle_vampire_cloak()
if(istype(loc, /turf/space))
check_sun()
mind.vampire.nullified = max(0, mind.vampire.nullified - 1)
return
code/modules/mob/living/simple_animal/borer.dm
+12 -9
View File
@@ -12,6 +12,12 @@
return
if(istype(src.loc,/mob/living/simple_animal/borer))
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
return
log_say("[key_name(src)] : [message]")
if (stat == 2)
return say_dead(message)
var/mob/living/simple_animal/borer/B = src.loc
src << "You whisper silently, \"[message]\""
B.host << "The captive mind of [src] whispers, \"[message]\""
@@ -95,7 +101,6 @@
/mob/living/simple_animal/borer/New(var/by_gamemode=0)
..()
truename = "[pick("Primary","Secondary","Tertiary","Quaternary")] [rand(1000,9999)]"
host_brain = new/mob/living/captive_brain(src)
if(!by_gamemode)
request_player()
@@ -215,10 +220,6 @@
src << "You cannot do that in your current state."
return
if(!host.internal_organs_by_name["brain"]) //this should only run in admin-weirdness situations, but it's here non the less - RR
src << "<span class='warning'>There is no brain here for us to command!</span>"
return
if(docile)
src << "\blue You are feeling far too docile to do that."
return
@@ -244,6 +245,8 @@
host_brain.ckey = host.ckey
host_brain.name = host.name
if(!host_brain.computer_id)
host_brain.computer_id = h2b_id
@@ -274,7 +277,7 @@
/mob/living/simple_animal/borer/verb/secrete_chemicals()
set category = "Alien"
set name = "Secrete Chemicals"
set name = "Secrete Chemicals (50)"
set desc = "Push some chemicals into your host's bloodstream."
if(!host)
@@ -291,9 +294,9 @@
if(chemicals < 50)
src << "You don't have enough chemicals!"
var/chem = input("Select a chemical to secrete.", "Chemicals") in list("bicaridine","tramadol","hyperzine","alkysine")
var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("alkysine","bicaridine","hyperzine","tramadol")
if(chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
src << "\red <B>You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream.</B>"
@@ -483,7 +486,7 @@ mob/living/simple_animal/borer/proc/detatch()
set desc = "Enter an air vent and crawl through the pipe system."
set category = "Alien"
handle_ventcrawl()
/mob/living/simple_animal/borer/can_use_vents()
return