30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
d5ac974d10
fixed typos ( #4895 )
...
title
2018-02-21 02:02:15 -06:00
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
7e2df51283
Changes mine code, adds random mine spawners ( #4817 )
2018-02-15 12:19:58 -08:00
05c62ba9eb
Adds EMP mines ( #4679 )
...
* Revert "Update #3 ? 4?"
* Revert "Revert "Update #3 ? 4?""
* Adds the disabled mech tools.
* indentation
* Counter-update
* Refactors mine code. Adds emp mines.
* Hecking spaces
* It compiles this time. For real, I swear
2018-02-10 01:53:54 -06:00
fa6ff94474
What's Yours Is Mined ( #4556 )
...
* Boom!
* Wires!
2018-02-09 18:56:46 -08:00
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
d592d1fc17
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into virologyfixes
2018-02-07 03:40:06 +00:00
3fd1571a4b
Merge pull request #4724 from Anewbe/ghettoChutes
...
Fixes ghetto chutes
2018-02-06 14:14:30 -05:00
5847319443
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
67e22cf0a6
Closets and Mechs no longer prevent death by freefall
2018-02-05 00:53:12 -06:00
5fac3abdc3
Virology changes
2018-02-04 03:46:23 -05:00
7b8c116c2b
Merge pull request #4698 from Cyantime/patch-1
...
Reorder some of the planetary fall trigger
2018-02-03 16:08:27 -06:00
cef001bf2a
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
e1979e9672
Adds a variety of dead things for mapping ( #4680 )
...
* Adds a variety of remains for mapping use.
* fixed icons, typos
2018-02-02 13:11:36 -06:00
4c27b60e2b
Reorder some of the planetary fall trigger
2018-02-01 20:12:26 -05:00
e69af92218
Move these defines into proper files ( #4653 )
2018-01-28 18:09:35 -08:00
6c1ab66d44
POLARIS: Allow pulling objects through step teleports. ( #4635 )
2018-01-28 01:10:20 -08:00
88cab44124
Merge pull request #2848 from VOREStation/aro-exploration
...
Exploration Update
2018-01-27 15:32:42 -05:00
19b2d5a338
VS: Polaris already has this, I need it now though
2018-01-27 14:10:51 -05:00
1910940c43
VS: Remove some bad VS edits
2018-01-27 14:10:50 -05:00
8a147d5a3a
POLARIS: Move these defines elsewhere
2018-01-26 17:17:40 -05:00
716a932f26
POLARIS: Allow pulling objects through step teleports.
2018-01-25 16:44:30 -05:00
4706e8d0cc
Falling from the sky should work again
2018-01-23 23:40:03 -06:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
5b54f4c875
Surface Map Work ( #4557 )
...
* Tweaks Surface, POI system
* More Stuff
* Travis Appeasement
* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
d0d6689263
Web Shuttle Update
...
Adds autopilot functionality for shuttle one and shuttle two. It can be enabled and disabled by the flight computer.
Autopilot is active by default on both shuttles. The shuttle waits for two minutes when it reaches the outpost or station, except for the first flight, where it waits for about ten minutes, which should be plenty of time for people to get on and for the pilot to turn it off if one exists.
Adds renaming feature to all shuttles.
Ports /tg/'s 'shuttle warning' effect, which adds a bunch of blue circles where a ship is about to land, which should prevent surprise shuttle crushes if paying attention.
Flight times for all routes are cut in half to act as the bonus for flying manually. Automatic flight takes twice as long, and so it will take the current amount of time.
Makes Ninja shuttle faster because Nippen steal.
Does some cleanup with temporary effects.
2018-01-14 14:03:58 -05:00
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
bde9ae6f7e
Adds Visual Cleavage
...
Axes executing a cleaving attack now has a visual effect to show the tiles that can potentially get hit.
Gives hatchets and the energy axe the ability to cleave.
2017-12-31 05:53:39 -05:00
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
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
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
e51f3aad61
Fixes sprites, moves planetary explosion to fall_impact
2017-12-02 16:36:50 -06:00
c2a8afb7c0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
...
# Conflicts:
# icons/mob/back.dmi
# icons/obj/storage.dmi
2017-12-01 18:47:06 -06:00
085c33e39a
Adds parachutes
2017-12-01 18:37:30 -06:00
af5c633cdb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
...
# Conflicts:
# code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
acb208dd3f
Works on New Blob
2017-11-29 22:35:01 -05:00
2f7db506eb
Adds Variable Click Delay
...
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
d5404ae0eb
Adds More Spiders. Touches cuff-code tangentially.
2017-11-21 12:59:06 -08:00
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
fce9fe2c72
Merge pull request #4188 from Atermonera/VR_2
...
Virtual Reality
2017-11-03 15:10:53 -05:00
64942bd04c
VR Core
2017-10-30 22:32:36 -07:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
920e823a46
Fuel-Rod Gun, Minor fixes related. ( #4103 )
...
* A whole load of things.
* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
9a04744ab6
Turrets detect targets through metal foam.
2017-10-15 13:48:38 -07:00
56ec5ec94c
Adds three flame-themed illegal Mech weapons and more. ( #4058 )
...
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.
* Removes world << because I'm a good coder honest.
* Why does Git do this for no reason.
2017-10-13 23:32:52 -05:00
4bc0708f01
Merge pull request #2282 from Cyantime/grublarvs
...
Improves solargrub larva
2017-10-12 18:12:31 -04:00
612db9b2c0
wooorms
2017-10-11 13:29:31 -04:00
1f0bb5891c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles
...
# Conflicts resolved:
# code/modules/busy_space/organizations.dm
2017-10-10 01:19:53 -04:00
Leshana
