Leshana
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
MarinaGryphon
3f98312535
Ports hoists, as well as some macros, from Aurorastation. ( #4451 )
...
* Ports hoists.
* Ports use_check
2018-01-01 12:17:35 -08:00
Arokha Sieyes
4374bef62a
Merge pull request #2636 from VOREStation/aro-talkicons
...
Flips talking icons to the right side
2017-12-27 15:45:33 -05:00
Arokha Sieyes
8a349ee87c
Flips talking icons to the right side
...
So they don't sit under the HUD icons half the time. Kind of annoying. This is how it used to be.
2017-12-27 02:38:52 -05:00
Arokha Sieyes
d998f36c38
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
...
# Conflicts:
# code/game/objects/structures/signs.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/organs/organ_icon.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2017-12-26 23:07:58 -05:00
BothNevarBackwards
4540f770d4
Lots of species stuff ported from Baystation ( #4442 )
...
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center
* Flash stuff glasses protection things
* Flash stuff actual thing
* Organ mult thingy
* Floaty eyes and cloak setup
* Species falling
2017-12-26 14:28:21 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe
e51f3aad61
Fixes sprites, moves planetary explosion to fall_impact
2017-12-02 16:36:50 -06:00
Anewbe
132168bc81
Further parachute functionality
2017-12-01 22:11:38 -06:00
Anewbe
085c33e39a
Adds parachutes
2017-12-01 18:37:30 -06:00
Cyantime
c2bfa94789
You can no longer fall onto and hit ghosts.
2017-11-28 15:40:48 -05:00
killer653
9ead1295e1
Github didn't push this
2017-11-18 11:10:53 -05:00
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
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
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
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
Cyantime
68c053212c
Disables phasing downward through catwalks
2017-08-02 22:29:42 -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
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
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
