Commit Graph

189 Commits

Author SHA1 Message Date
killer653
afa7b21dc9 Fixes permastuns. Prevents doubledamage 2017-11-18 10:37:58 -05:00
killer653
3e2cf7c9b7 Makes stairs function as before
Video: https://i.imgur.com/EvqCQux.gifv
2017-11-12 01:15:33 -05:00
killer653
b1ce51c2b3 Adds in Drop Noms
Information to include in PR
Panel: https://i.imgur.com/Ru0Mb2w.png
Pred falling onto prey: https://i.imgur.com/Y28TaJn.gifv
Prey falling onto pred: https://i.imgur.com/DzZlQbr.gifv
Person falling onto person w/ unaligned prefs:
https://i.imgur.com/DzZlQbr.gifv
Pred falling onto prey does anywhere from 0 to 30 damage to the pred
Prey falling into pred does 0 damage to both.
Unaligned causes the faller to suffer damage & a stun, person being
fallen on gets stunned
Dropping onto someone w/ dropnom: https://i.imgur.com/PywIfAI.png
Dropping onto someone w/ dropnom: https://i.imgur.com/H7o5g9f.png
2017-11-12 00:32:54 -05:00
Cameron Lennox
4f289c84c6 Agh 2017-11-11 19:24:59 -05:00
Cameron Lennox
c9ee48b78f WIP 2017-11-11 19:24:35 -05:00
Dwaggy
3ae88bfe43 >turf.dm movement.dm station/station_special_abilities_vr.dm
Changes to files for flight trait:
 - Removed nutriment cost. it was far too high for something that was just mostly for flash and show.
 - Removed the whole..sliding around while flying. if your a creature that can fly, you should be more incontrol of that shit.
    - However, if your not paying attention, bumping in to walls and stuff does still happen, and will still knock you down and out of flying. but now its *your fault*, not the sliding.

species/species_attack_vr.dm

- Changes made to the numbing bite attack
 - Can now attack self, and inject self with the venom to numb your own pain
  -Keeping an eye on this change, potential to be OP if abused, but there are work arounds for it, which cause it to be more OP with the correct tools. at least this way, the bite will cause the user injury on use.

 - Possible thoughts and notes for future: Traits that change the chemical injected on bite? perhaps a bite that actually causes injury/halucinations. Aphro? (hahah.) plenty of untapped ideas for a venom bite, really, both healing and..venomous.
2017-11-10 17:06:50 +00:00
Kelshark
8b32b39c6f Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
2017-11-07 08:17:53 -05:00
killer653
42c8d39def Fixes issues 2017-11-03 18:23:20 -04:00
killer653
f81499a052 whoops 2017-11-01 17:54:43 -04:00
killer653
529b55798e Stops runtimes 2017-11-01 17:46:35 -04:00
killer653
cd423e7d07 Flying check 2017-10-31 19:20:41 -04:00
killer653
954d254f11 Makes the var on /mob, making it easier to porrt. 2017-10-31 19:08:45 -04:00
killer653
e6c573ba8e Quick fix 2017-10-31 17:27:32 -04:00
killer653
02e25ebe3d I hate this keyboarrd 2017-10-30 18:19:00 -04:00
killer653
cfb3b84087 Adds flight limit 2017-10-30 18:16:15 -04:00
killer653
fc5f6c084b Adds a limit to flying. 2017-10-30 18:12:17 -04:00
Kelshark
92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
2017-10-29 18:14:56 -04:00
Cameron Lennox
c99e7b51da Changes the knockout checks to incap all.
Also stops micro interactions while flying.
2017-10-29 11:30:43 -04:00
killer653
28e75a89aa Makes incap checks more extensive. 2017-10-28 21:28:56 -04:00
killer653
27c16465ac Forgot H. 2017-10-28 21:02:24 -04:00
killer653
8938620fd3 Adds some stop_flying procs. 2017-10-28 21:01:36 -04:00
killer653
884e80cd7d Checks for incap instead. Prevents floating on tiles 2017-10-28 20:29:07 -04:00
killer653
e9585bfc6d Allows flight with wings. 2017-10-28 19:51:14 -04:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Spades
edfa947278 These are not Vorestation edits. (#4088)
Y'all are confusing the shit out of us.
2017-10-16 23:01:30 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Woodratt
0f6d0a9e4f Porting see down through open spaces
Ported 'see-down' open spaces from Vore, who ported it from Eris

Ported talking and visible messages traveling upwards through open spaces

Tested, seems to work? Does not seem to break anything, maybe.

Maybe made a changelog.
2017-10-09 22:05:20 -07:00
Woodratt
3e90725a45 Catwalks and Railings
Added catwalks and railings. Ported from Vorestation who ported them from Eris.

Note, catwalks can be placed on plating (as is seen on the vorestation map Tether) and is done so here as well. However it doesn't seem like it is possible to build said catwalks on plating. Did not bother to adjust this at this time. Something to sort in the future.

Adjusted SC station dmm to use both the railing and catwalks as well as a couple fixes for the floor tile adjustment in a earlier commit.
2017-09-16 00:54:33 -07:00
Kelshark
5ee893eda1 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
#	maps/tether/tether-03-station.dmm
#	vorestation.dme
2017-09-03 12:49:08 -04:00
Verkister
bbc2a5cf9b More backup backup checks to maybe finally make sure only on-turf objects may fall down
Onsite edit because fuck this. I had it fixed and working before.
NO BAD Z-HOLE. NO EATING SHIT OFF HANDS AND FOLKS YOU BAD. ONLY FLOOR FOOD FOR YOU
2017-08-27 16:18:40 +03:00
Kelshark
f2f35697fb Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
2017-08-18 08:14:12 -04:00
Cyantime
68c053212c Disables phasing downward through catwalks 2017-08-02 22:29:42 -04:00
Kelshark
949a012a18 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether_defines.dm
2017-07-20 15:50:53 -04:00
Verkister
3e1dc9493b fixes the lattices too.
Same thing as catwalks, your stuff shouldn't fall down from your pockets unintended.
2017-07-18 19:46:57 +03:00
Verkister
b540e51ae9 FIXES THE CATWALK INVENTORY BS
Things that are not on the turf floor should no longer drop through catwalks. YOU CAN NOW SAFELY BAG YOUR CRAP WITHOUT LOSING IT TO THE VOID THAT IS THE FLOOR DOWNSTAIRS.
2017-07-18 18:32:07 +03:00
Kelshark
ab85a2c376 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/resleeving/infocore_records.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/widerobot_vr.dmi
#	vorestation.dme
2017-06-18 15:35:35 -04:00
Kelshark
a17b2437e8 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	vorestation.dme
2017-06-12 12:39:07 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
2017-06-10 22:44:03 -04:00
Arokha Sieyes
e38dceeca1 Another openspace tweak
In an attempt to stop more crashes
2017-06-09 01:31:08 -04:00
Arokha Sieyes
2a19272f4a Openspace Bass Ackwards
That math, yo. It's hard.
2017-06-06 21:40:18 -04:00
Arokha Sieyes
a333c8131b Workaround for openspace turf corruption.
It's an unresolved byond bug.
2017-06-06 19:51:00 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Neerti
b5802fb185 Makes Mechs Fall
Mechs now will fall when crossing an open tile.
Anything below that tile will have a bad day.
Also makes lighting overlays unable to fall just incase.
2017-06-01 15:05:51 -04:00
Kelshark
15b8fcbe6d Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme
2017-05-24 13:46:58 -04:00
Leshana
be19a40248 Fix missing closing HTML tags in messages. 2017-05-20 16:05:54 -04:00
Leshana
6770aba0f6 Allow pulling objects down stairs. Hopefully without too many wierd concequences. 2017-05-19 21:17:34 -04:00
Leshana
8fd50fd530 Fix movement over open space
* Lattices no longer block all downward movement out of their turf, they only block downward falling out of their turf.
* Objects are once again pullable on catwalks (not 100% sure why they were not, but had to do with the falling code calling Move())
* Falling on top of a mob will no longer do an infinate loop of swapping places vertically.
2017-05-19 13:05:49 -04:00
Leshana
8eaa363730 Memory performance fixes for open space
* Don't infinately accumulate underlays!
* Ease up on the New() and Destroy(),  make sure they are a top level object (loc is a turf)
* The open space darkness overlay is always the same, make it a global.
2017-05-19 00:07:08 -04:00
Leshana
fdfa1274dc Run open space controller once during lobby so game will start with it done. 2017-05-18 19:55:02 -04:00