cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ninja Quickfix, ERT Armory now has a blast door

Browse Source
This commit is contained in:
SamCroswell
2014-01-21 23:04:50 -05:00
parent 959501b332
commit 7facce411c
3 changed files with 3662 additions and 3676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/events/ninja_abilities.dm
+2 -3
View File
@@ -78,8 +78,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
var/mob/living/carbon/human/U = affecting
var/turf/destination = get_teleport_loc(U.loc,U,9,1,3,1,0,1)
var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
if(mobloc.loc.name != "SpiderClan Outpost")
U << "[mobloc.loc.name]"
if(mobloc.loc.name != "\improper SpiderClan Outpost")
if(destination&&istype(mobloc, /turf))//The turf check prevents unusual behavior. Like teleporting out of cryo pods, cloners, mechs, etc.
spawn(0)
playsound(U.loc, "sparks", 50, 1)
@@ -118,7 +117,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
if(!ninjacost(C,1))
var/mob/living/carbon/human/U = affecting
var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
if(mobloc.loc.name != mobloc.loc.name)
if(mobloc.loc.name != "\improper SpiderClan Outpost")
if((!T.density)&&istype(mobloc, /turf))
spawn(0)
playsound(U.loc, 'sound/effects/sparks4.ogg', 50, 1)
code/game/gamemodes/events/ninja_equipment.dm
+1 -3
View File
@@ -501,7 +501,6 @@ ________________________________________________________________________________
var/mob/living/carbon/human/U = affecting
var/mob/living/silicon/ai/A = AI
var/display_to = s_control ? U : A//Who do we want to display certain messages to?
var/turf/mobloc // For use later on during a check in Kamikaze
if(s_control)
if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on.
@@ -595,8 +594,7 @@ ________________________________________________________________________________
if("Unlock Kamikaze")
if(input(U)=="Divine Wind")
mobloc = get_turf(U.loc)
if(mobloc.loc != /area/ninja_outpost)
if(U.loc.loc.name != "\improper SpiderClan Outpost")
if( !(U.stat||U.wear_suit!=src||!s_initialized))
if( !(cell.charge<=1||s_busy) )
s_busy = 1