Atermonera
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
Heroman
5a9e1f1566
Ports some fixes
2019-04-07 14:02:34 +10:00
Novacat
2609d9fc2b
Merge branch 'master' into upstream-merge-5889
2019-03-27 20:15:17 -04:00
Neerti
d4baa2df07
Allows borgs to move up and down with jetpacks
2019-01-21 02:58:07 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Arokha Sieyes
b099ac6e4c
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
...
# Conflicts:
# code/__defines/holomap.dm
# code/__defines/mobs.dm
# code/_helpers/icons.dm
# code/_helpers/unsorted.dm
# code/_onclick/hud/hud.dm
# code/_onclick/item_attack.dm
# code/controllers/Processes/supply.dm
# code/controllers/subsystems/planets.dm
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/science.dm
# code/datums/supplypacks/security.dm
# code/datums/supplypacks/supply.dm
# code/game/area/Space Station 13 areas.dm
# code/game/atoms_movable.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/jukebox.dm
# code/game/machinery/recharger.dm
# code/game/machinery/vending.dm
# code/game/mecha/equipment/tools/medical_tools.dm
# code/game/mecha/equipment/weapons/weapons.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/megaphone.dm
# code/game/objects/items/poi_items.dm
# code/game/objects/items/weapons/implants/implantlanguage.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/objects/structures/flora/trees.dm
# code/game/objects/structures/plasticflaps.dm
# code/game/supplyshuttle.dm
# code/game/turfs/simulated/wall_attacks.dm
# code/modules/admin/admin_verbs.dm
# code/modules/assembly/infrared.dm
# code/modules/client/client procs.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/client/preferences.dm
# code/modules/clothing/suits/miscellaneous.dm
# code/modules/holomap/holomap_datum.dm
# code/modules/holomap/station_holomap.dm
# code/modules/integrated_electronics/core/printer.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/death.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/robot.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob_movement.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/subtypes/standard.dm
# code/modules/planet/weather.dm
# code/modules/power/cable.dm
# code/modules/power/fusion/core/core_control.dm
# code/modules/power/fusion/fuel_assembly/fuel_control.dm
# code/modules/power/fusion/gyrotron/gyrotron_control.dm
# code/modules/projectiles/gun.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# config/names/first_name_skrell.txt
# config/names/last_name_skrell.txt
# icons/mob/head.dmi
# icons/mob/robots.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/obj/ammo.dmi
# icons/obj/gun.dmi
# icons/obj/mining.dmi
# icons/obj/projectiles.dmi
# icons/obj/rig_modules.dmi
# icons/obj/surgery.dmi
# icons/turf/walls.dmi
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-8.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
# maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
# maps/submaps/surface_submaps/mountains/deadspy.dmm
# maps/submaps/surface_submaps/mountains/mountains_areas.dm
# maps/submaps/surface_submaps/plains/Thiefc.dmm
# maps/~map_system/maps.dm
# vorestation.dme
2018-09-27 18:01:09 -04:00
Anewbe
a13783945f
MultiZ falling tweaks
2018-08-04 23:32:04 -05:00
Layne
01fddbbc02
Sky is not a 'skiy' ( #5344 )
...
* Clandestine (Original Commit)
* Revert "Clandestine (Original Commit)"
This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.
* the skiy
2018-06-11 14:11:16 -04:00
Layne
b4c1722bd6
Sky is not a 'skiy' ( #5344 )
...
* Clandestine (Original Commit)
* Revert "Clandestine (Original Commit)"
This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.
* the skiy
2018-06-11 13:10:40 -05:00
Leshana
b5cf8383f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
...
# Conflicts:
# code/game/machinery/jukebox.dm
# code/modules/economy/lorenews.dm
# code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Mechoid
57ab0e715b
Constructs 2.0 - Living Stone ( #5040 )
...
* Construct Overhaul + Related Fixes/Tweaks
2018-04-04 23:45:00 -07:00
Arokha Sieyes
3d4fe98277
POLARIS: Allow crawling through vertical pipes
2018-03-25 17:08:53 -04:00
Arokha Sieyes
9d70e95e82
POLARIS: Allow crawling through vertical pipes
2018-03-18 18:18:28 -04:00
Leshana
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
Anewbe
d6b249817d
Falling onto space no longer hurts ( #4774 )
2018-02-10 23:25:54 -08:00
Anewbe
64588484bf
Mechs can now fall from non-shuttle heights without hurting the occupant ( #4776 )
2018-02-10 20:03:06 -08:00
Anewbe
f0ce7f9643
Falling one floor is no longer a death sentence ( #4759 )
2018-02-08 12:59:24 -08:00
Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
Anewbe
67e22cf0a6
Closets and Mechs no longer prevent death by freefall
2018-02-05 00:53:12 -06: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
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
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
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
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
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
