Commit Graph
2723 Commits
Author SHA1 Message Date
Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
LeshanaandAnewbe 224fe42e77 Prepare Atmospherics Machinery for SSatoms (#4501)
* to_chat() replacement.

* Revert calling target.init_dir() before connecting.

* This change was added in https://github.com/PolarisSS13/Polaris/pull/3775 to counteract `dir` not being set prior to New() for dynamically loaded maps.  The root cause was /atom/New() not calling _preloader.load().  Undoing the change now that /atom/New() is fixed.
* The addition of the init_dir() proc itself however, is useful, because there ARE other times some atmos machinery will want to re-initialize its dir, specifically whenever it is rotated.
* init_dir() must be called in the constructor of all atmospherics machines capable of connecting to another.   Since it has to happen for ALL machines, lets move that call to /obj/machinery/atmospherics/New()

* Rename /obj/machinery/atmospherics initialize() to atmos_init()

* These days `initialize()` is used to handle general object initialization that is moved outside of New().  The node connection discovery of atmos machinery needs to happen after all that, and so needs to be in a separate proc.
* Make sure to actually call atmos_init during system startup.
2018-01-06 10:52:56 -06:00
AnewbeandGitHub 2b2a5dc565 Merge pull request #4503 from Neerti/1/1/2018_bonfires
Adds Bonfires
2018-01-05 13:36:19 -05:00
Neerti 42a421e8e1 Adds Bonfires 2018-01-05 02:35:19 -05:00
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
NeertiandArokha Sieyes 250fe6e2ff Fixes Exploit with Power Tools 2018-01-04 03:08:56 -05:00
NeertiandGitHub 58a8e6a066 Merge pull request #4499 from Neerti/1/3/2018_why
Fixes Exploit with Power Tools
2018-01-03 15:50:02 -05:00
Neerti 5a0a04d2dd Fixes Exploit with Power Tools 2018-01-03 15:40:43 -05:00
AnewbeandGitHub d1422641bf Merge pull request #4475 from Neerti/12/31/2017
Adds Visual Cleavage
2018-01-02 20:04:50 -05:00
AnewbeandGitHub 2f84a7dc95 Merge pull request #4489 from VOREStation/qdel-hints-gen5
Additional Destroy proc fixes
2018-01-02 20:04:02 -05:00
AnewbeandGitHub 7ec8c9614f Merge pull request #4479 from Neerti/1/1/2018_handtele_fix
Removes Hardcoded Z-check on Handteles
2018-01-02 20:01:09 -05:00
Leshana cc3397c4fa Fixes "was unable to be GC'd" when deleting tanks. 2018-01-02 13:13:49 -05:00
Neerti 27ff2bd736 Removes Hardcoded Z-check on Handteles
Instead they use the using_map datum to see if the person using a hand-tele is on an admin level.
2018-01-01 06:41:17 -05:00
Neerti 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
Leshana 064f2fe9ca Additional types which need Destroy to return qdel hints (and other Destroy fixes) 2017-12-30 16:02:27 -05:00
Verkister 7e99f11fe6 Fixes unfoldable boxes.
-Apparently storage proc for this thing was changed to return 1 regardless if the item had the quick empty verb or not, which in turn triggered the very first nope of the box specific code.
-Boxes can be quick emptied but lack the actual verb apparently?
2017-12-29 13:28:44 +02: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
Woodratt ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
mistyLuminescenceandAtermonera c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
AnewbeandGitHub ebdf9b191b Merge pull request #4425 from MisterLayne/energy_spear_fixed
Energy Spear
2017-12-11 00:47:05 -06:00
MisterLayne 0e5a097534 Second time is the charm. 2017-12-09 09:38:03 -05:00
NeertiandGitHub 791754b2de Merge pull request #4382 from Anewbe/parachute
Adds parachutes
2017-12-08 20:17:51 -05:00
BelsimaandAnewbe 8d3ceab287 grammar never ends (#4421)
* Update Sleeper.dm

* Update robot_fabricator.dm

* Update requests_console.dm

* Update vr_console.dm

* Update teleporter.dm

* Update records_scanner.dm

* Update mercrenegade.dm

* Update clown_items.dm

* Update firstaid.dm

* Update teleporter.dm

* capitalization fixes

* Update clown_items.dm
2017-12-08 15:30:34 -06:00
BelsimaandAnewbe ad0ad62cde The game actually clicks when it claims to. (#4403)
* Update paiwire.dm

* Update life.dm

* Update traps.dm

* Update safe.dm

* Update alarm.dm

* Update safe.dm

* Update implant.dm

* Update life.dm

* Update traps.dm

* Update life.dm

* Update safe.dm

* Audible message test
2017-12-07 18:18:01 -06:00
Anewbe 573d3a1bbd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
# Conflicts:
#	icons/obj/storage.dmi
2017-12-07 17:59:13 -06:00
LayneandAnewbe 4d842c6590 Adds snowballs. (#4414) 2017-12-07 17:51:36 -06:00
mistyLuminescenceandAnewbe 4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
mistyLuminescenceandAnewbe 0d458b204e Adds the advanced health analyzer (#4326)
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
2017-12-03 17:36:51 -06:00
AnewbeandGitHub 5fffb9d51f Merge pull request #4378 from Neerti/12/1/2017_reaching_weapons
Adds Reach Variable to Weapons
2017-12-02 12:00:26 -06:00
Anewbe 132168bc81 Further parachute functionality 2017-12-01 22:11:38 -06:00
Anewbe 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
Anewbe 085c33e39a Adds parachutes 2017-12-01 18:37:30 -06:00
LayneandAnewbe 3f21df1ae2 Fixy fixy. (#4314) 2017-12-01 16:18:20 -06:00
mistyLuminescenceandAnewbe 4d44d47a59 Mobile Camera Pods (#4330)
* Adds tactical cameras!

* Adds MCP crate

* Destroy the tac-cams!

* Updates description

* Removes MCP box from Armory

* we can't actually get MCPs any more
2017-12-01 16:00:49 -06:00
Neerti 5796b14220 Adds Reach Variable to Weapons
Melee weapons can now potentially attack from farther away.
Obstacles are taken into account, so you cannot hit people through windows, but you can attack over specific things such as tables, or other people.
Currently only the spear can do this, with a range of two tiles, however the attack speed for the spear was reduced, so it may remain a situational weapon.
The intention for this is to make specific weapons feel different to each other besides 'does more damage', and I got ideas on other kinds of weapon adjustments later to make them feel a bit more unique.
2017-12-01 12:42:40 -05:00
Neerti 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
Neerti acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti 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
AnewbeandGitHub 1cb9503790 Merge pull request #4344 from MisterLayne/you_do_not_hold_the_conch
Fixes One Crew Member Law
2017-11-27 15:37:23 -06:00
Neerti 01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
MisterLayne ab83bb90be One Crew Member 2017-11-26 12:28:59 -05:00
Neerti 5b0b639377 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi
# Conflicts resolved:
#	maps/submaps/cave_submaps/cave_areas.dm
2017-11-26 12:09:55 -05:00
Neerti 7497aef295 work 2017-11-26 12:08:05 -05:00
AnewbeandGitHub d524d721b9 Merge pull request #4335 from Neerti/11/22/2017_explorer_gear
Adds Exploration Equipment
2017-11-25 14:39:12 -06:00
Neerti 8ac2100fa2 Adds Exploration Equipment
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
CyantimeandGitHub 9ba6d5759a Fixes 'reques console' 2017-11-22 18:25:49 -05:00
Mechoid d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
NeertiandGitHub d36d09d937 Merge pull request #4176 from Anewbe/battery_things
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
AnewbeandGitHub 1fb2e32e2f Merge pull request #4297 from Neerti/11/18/2017_make_syndie_toolboxes_special_again
Makes Syndie Toolboxes Special Again
2017-11-19 17:25:44 -06:00