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

Fixes issues

Browse Source
This commit is contained in:
killer653
2017-11-03 18:23:20 -04:00
parent f81499a052
commit 42c8d39def
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/turfs/turf.dm
View File

@@ -145,7 +145,7 @@ var/const/enterloopsanity = 100
M.lastarea = get_area(M.loc)
if(M.lastarea.has_gravity == 0)
inertial_drift(M)
if(M.flying == 1) //VORESTATION Edit Start. This overwrites the above is_space without touching it all that much.
if(M.flying) //VORESTATION Edit Start. This overwrites the above is_space without touching it all that much.
inertial_drift(M)
M.make_floating(1) //VOREStation Edit End.
else if(!is_space())

2
code/modules/mob/animations.dm
View File

@@ -88,7 +88,7 @@ note dizziness decrements automatically in the mob's Life() proc.
return
if(ishuman(src)) //VOREStation Edit Start. Floating code.
var/mob/living/carbon/human/H = src
if(H.flying == 1)
if(H.flying)
make_floating(1)
return //VOREStation Edit End
var/turf/turf = get_turf(src)

8
code/modules/mob/living/carbon/human/human.dm
View File

@@ -1202,13 +1202,13 @@
species.update_attack_types() //VOREStation Edit Start Required for any trait that updates unarmed_types in setup.
if(species.gets_food_nutrition != 1) //Bloodsucker trait. Tacking this on here.
verbs |= /mob/living/carbon/human/proc/bloodsuck
if(species.can_drain_prey == 1)
if(species.can_drain_prey)
verbs |= /mob/living/carbon/human/proc/succubus_drain //Succubus drain trait.
verbs |= /mob/living/carbon/human/proc/succubus_drain_finialize
verbs |= /mob/living/carbon/human/proc/succubus_drain_lethal
if(species.hard_vore_enabled == 1) //Hardvore verb.
if(species.hard_vore_enabled) //Hardvore verb.
verbs |= /mob/living/carbon/human/proc/shred_limb
if(species.can_fly == 1)
if(species.can_fly)
verbs |= /mob/living/proc/flying_toggle //Flying wings!
verbs |= /mob/living/proc/start_wings_hovering
//VOREStation Edit End
@@ -1451,7 +1451,7 @@
/mob/living/carbon/human/Check_Shoegrip()
if(shoes && (shoes.item_flags & NOSLIP) && istype(shoes, /obj/item/clothing/shoes/magboots)) //magboots + dense_object = no floating
return 1
if(flying == 1) //VOREStation Edit. Checks to see if they have wings and are flying.
if(flying) //VOREStation Edit. Checks to see if they have wings and are flying.
return 1 //VOREStation Edit.
return 0

4
code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
View File

@@ -760,11 +760,11 @@
if(C.nutrition < 50 && !C.flying) //Don't have any food in you?" You can't hover, since it takes up 25 nutrition. And it's not 25 since we don't want them to immediately fall.
to_chat(C, "<span class='notice'>You lack the nutrition to fly.</span>")
return
if(C.anchored == 1)
if(C.anchored)
to_chat(C, "<span class='notice'>You are already hovering and/or anchored in place!</span>")
return
if(C.anchored != 1 && !(C.pulledby)) //Not currently anchored, and not pulled by anyone.
if(!C.anchored && !C.pulledby) //Not currently anchored, and not pulled by anyone.
C.anchored = 1 //This is the only way to stop the inertial_drift.
C.nutrition -= 25
update_floating()

2
code/modules/mob/mob_movement.dm
View File

@@ -517,7 +517,7 @@
return dense_object
/mob/proc/Check_Shoegrip()
if(flying == 1) //VOREStation Edit. Checks to see if they and are flying.
if(flying) //VOREStation Edit. Checks to see if they and are flying.
return 1 //VOREStation Edit. Checks to see if they are flying. Mostly for this to be ported to Polaris.
return 0

17
code/modules/multiz/movement.dm
View File

@@ -51,7 +51,7 @@
return 0
else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying??
var/mob/H = src
if(H.flying == 1)
if(H.flying)
if(H.incapacitated(INCAPACITATION_ALL))
to_chat(src, "<span class='notice'>You can't fly in your current state.</span>")
H.stop_flying() //Should already be done, but just in case.
@@ -59,7 +59,7 @@
var/fly_time = max(7 SECONDS + (H.movement_delay() * 10), 1) //So it's not too useful for combat. Could make this variable somehow, but that's down the road.
to_chat(src, "<span class='notice'>You begin to fly upwards...</span>")
destination.audible_message("<span class='notice'>You hear the flapping of wings.</span>")
H.audible_message("<span class='notice'>[H] begins to flap \his wings, preparing to move upwards!.</span>")
H.audible_message("<span class='notice'>[H] begins to flap \his wings, preparing to move upwards!</span>")
if(do_after(H, fly_time) && H.flying)
to_chat(src, "<span class='notice'>You fly upwards.</span>")
else
@@ -164,7 +164,7 @@
return
if(ismob(src))
var/mob/H = src //VOREStation Edit Start. Flight on mobs.
if(H.flying == 1) //Some other checks are done in the wings_toggle proc
if(H.flying) //Some other checks are done in the wings_toggle proc
if(H.nutrition > 2)
H.nutrition -= 2 //You use up 2 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it.
if(H.incapacitated(INCAPACITATION_ALL))
@@ -185,8 +185,15 @@
H.stop_flying()
else
return
if(H.grabbed_by.len) //If you're grabbed (presumably by someone flying) let's not have you fall. This also allows people to grab onto you while you jump over a railing to prevent you from falling!
return //VOREStation Edit End.
else if(ishuman(H)) //Needed to prevent 2 people from grabbing eachother in the air.
var/mob/living/carbon/human/F = H
if(F.grabbed_by.len) //If you're grabbed (presumably by someone flying) let's not have you fall. This also allows people to grab onto you while you jump over a railing to prevent you from falling!
var/obj/item/weapon/grab/G = F.get_active_hand()
var/obj/item/weapon/grab/J = F.get_inactive_hand()
if(istype(G) || istype(J))
//fall
else
return
if(can_fall())
// We spawn here to let the current move operation complete before we start falling. fall() is normally called from