Commit Graph

19697 Commits

Author SHA1 Message Date
Aronai Sieyes
c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Aronai Sieyes
999597dad1 Merge branch 'master' into polaris-sync-2018-02-07 2018-02-07 23:06:03 -05:00
Aronai Sieyes
0a415d0047 Merge pull request #2988 from VOREStation/aro-aerostat
Exploration Update #3
2018-02-07 22:22:01 -05:00
Leshana
a8c7c520bb VOREStation updates related to merged changes from polaris. 2018-02-07 20:08:10 -05:00
Arokha Sieyes
c871e617db VS: Swap two things to ion pistol rather than rifle 2018-02-07 20:03:44 -05:00
Arokha Sieyes
fb62a2fe45 VS: Two mob tweaks to make them better
Syndicate and hivebot
2018-02-07 20:03:41 -05:00
Arokha Sieyes
c493b83531 VS: Simple_animals avoid my custom sky too 2018-02-07 20:03:41 -05:00
Arokha Sieyes
8684fcf4eb POLARIS: Allow simple_animal to avoid turfs
Like the sky. TODO: Lava??
2018-02-07 20:03:41 -05:00
Arokha Sieyes
54b6e9de7d VS: Fix a totally unrelated qdel gc bug with a planemaster 2018-02-07 20:03:40 -05:00
Arokha Sieyes
deef737212 POLARIS: New mob var 'low_priority' for skipping life()
Mobs with this will not have life() called on them unless there's a non-observing player on the same z-level.
2018-02-07 20:03:40 -05:00
Arokha Sieyes
1496a17e63 VS: Adds two mobs: shadekin, jelly
Shadekin is WIP for now, can be used for events. Jelly is on Virgo 2.
2018-02-07 20:03:39 -05: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
442b5cbdf6 Comments out the automatic firemode code (#4748) 2018-02-07 09:59:42 -08:00
Verkister
78ab5c37f4 Squashed commit of the following:
commit 88761abcbdad12b25e4771837331ee3c40aeff19
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Feb 7 11:58:47 2018 +0200

    Some more gurgle related tweaks and fixes.
    -Removes gut transfers passing along preserved items list. (redundant with modern digest_act)
    -Adds panel update to trash eating.
    -Fixes borg sleeper gurgles causing double, maybe even triple damage due to being added into processing_objects list multiple times.
2018-02-07 12:01:11 +02:00
Neerti
54d7537f9c Merge pull request #4738 from Anewbe/hypospray_changes
Hyposprays and autoinjectors have a delay when used on a target that is not in help intent
2018-02-07 04:49:04 -05:00
Verkister
d2cb1e3011 Merge branch 'patch-8' of https://github.com/Verkister/VOREStation 2018-02-07 10:56:18 +02:00
Anewbe
8dcaeed33d Merge pull request #4728 from Cyantime/patch-1
Attacked mobs will always target attacker
2018-02-06 23:59:23 -06:00
Neerti
2cb7aab49c Merge pull request #4733 from Anewbe/budget_insulated
Budget Insulated Gloves tweaks
2018-02-07 00:52:56 -05:00
Burrito-Justice
e813ce4666 Updates all medical sprites to Bluebay (#4712)
* Updates all medical sprites to bluebay

* Forgot Odysseus w h o o p s

* heck forgot to change thing
2018-02-06 23:11:09 -06:00
Andromeda-K22
58cf8000ba Automatic firemode for guns (#4730)
* New gun firemode: automatic

Full-auto destruction at the tip of your fingers! If you're an admin. Switch the automatic var to 1 to make any gun automatic.

This code is largely donated by Mport and the SS:CM project. Relevant modifcations are located in automatic.dm, special.dm, and automagical.dm

* Removes '/blue's

* Removes a block of pseudocode.

* Welp. Missed some things.

* Automatic removed from the Suppression gun, as requested by @Anewbe in #4730

* Requested changes.
2018-02-06 22:57:53 -06:00
Anewbe
a234890b76 Merge pull request #4735 from elgeonmb/patch-3
moves us out of the kara system, pt 1
2018-02-06 21:08:12 -06:00
Cyantime
d0f32b4a53 Adds frontier phaser to cargo 2018-02-06 21:58:08 -05:00
Cyantime
be7d0dd8c2 Adds expedition guns to map 2018-02-06 21:02:01 -05:00
Cyantime
12747725d9 basic weapons for the expeditions 2018-02-06 20:02:55 -05:00
Anewbe
e40600c1e5 Merge pull request #4729 from VOREStation/vplk-ss-xenoarch
Move Xenoarcheology globals and initialization into a subsystem
2018-02-06 16:09:33 -06:00
Anewbe
e565108ce7 Hyposprays and autoinjectors have a delay when used on a target that is not in help intent 2018-02-06 13:35:30 -06:00
Neerti
3fd1571a4b Merge pull request #4724 from Anewbe/ghettoChutes
Fixes ghetto chutes
2018-02-06 14:14:30 -05:00
Neerti
8f0cb65b4f Merge pull request #4732 from elgeonmb/patch-2
very small grammar fix
2018-02-06 14:13:04 -05:00
Neerti
b8aa3ec0fc Merge pull request #4742 from MarinaGryphon/landing-fix
Fixes #4740.
2018-02-06 14:11:32 -05:00
Neerti
563d62d663 Merge pull request #4731 from Anewbe/phase_pistol
Phase pistol
2018-02-06 14:06:17 -05:00
Marina Gryphon
42e896da0d Should fix #4740. 2018-02-06 11:28:26 -06:00
elgeonmb
66c36b6beb moves us out of the kara system, pt 1 2018-02-05 23:21:20 -08:00
Anewbe
223de61bd4 Glove nerfs and tweaks 2018-02-06 00:45:43 -06:00
elgeonmb
f352cf2ccc very small grammar fix
it's -> it is, it has
its -> belonging to it, of it
2018-02-05 22:42:11 -08:00
Leshana
676efe73e5 Move Xenoarcheology globals and initialization into a subsystem
* Move the global spawning_turfs lists from master_controller into SSxenoarch.  Rename all references.
* Move the call to SetupXenoarch from master_controller.setup() to SSxenoarch.Initialize()  Put SSxenoarch init order near the end to match current behavior.
2018-02-06 01:08:10 -05:00
Anewbe
441bb3430e Corrects some small mistakes 2018-02-05 19:34:33 -06:00
Cyantime
46f9b36400 Attacked mobs will always target attacker 2018-02-05 19:12:45 -05:00
Anewbe
c30d1ca57b Tweaks the Explorer suit 2018-02-05 18:01:11 -06:00
Anewbe
52398aa0cf Adds Phase Pistols 2018-02-05 17:53:12 -06:00
Leshana
2c90995dcc Let objects register to be informed when shuttles have been setup.
* Switch /obj/shuttle_connector to use it instead of the icky process hack.
2018-02-05 15:50:15 -05:00
Leshana
8bec38ee00 Implement SSshuttles subsystem
* Replaces the shuttle_controller and shuttle process with the shuttles subsystem.  Instead of docking ports being initialized by the game ticker, its part of the StonedMC Master init order.
* The main advantage of this is control over the initialization order, as well as letting Master be aware of CPU we're using up with shuttle processing.
* By being part of the Master init order, we reduce the uncertainty about "are objects initialized yet?" which is nice, since shuttle docks break if machines aren't finished initializing!
2018-02-05 15:50:14 -05:00
Leshana
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
Leshana
44dc4b7286 Implement SSatoms
* Moves proc/initialize() from being on /atom/movable, /are and /turf/simulated to being on /atom - Now turfs can initialize too
* Added the SSatoms subsystem which controls initialization of atoms at roundstart and during normal conditions.
* Disabled the old auto_init = 0 behavior, ALL atoms should get initialized() called on them now.
* Refactored the way initialize() is called during /New() to utilize SSatoms instead of SScreation
* Removed SScreation, as it was only a stop-gap until SSatoms could be ported.
* Updated the maploader to inform SSatoms when it is loading maps instead of SScreation.
* Updated the template map loader to use SSatoms to perform initTemplateBounds
* Renamed 'initialized' var in seed_storage to deconflict.
* Removed usage of auto_init = 0, replaced with a no-op initialize() proc for atoms that don't need initialization.
2018-02-05 15:50:06 -05:00
Spades
dd7859ac0a Merge pull request #2978 from VOREStation/context-menu
Removes Licking from context menu
2018-02-05 10:13:46 -05:00
Spades
be91065e8e Licking 2018-02-05 06:43:55 -05:00
Spades
2dfa526b7a Merge pull request #2972 from VOREStation/aro-lang
Removes several ways to know every language
2018-02-05 05:21:02 -05:00
Verkister
dae786c52d Makes trash gains slightly more consistent.
-Basically everything else is more or less 1/10 ratio between nutrition and borg cell charge and now this is too.
2018-02-05 10:25:48 +02:00
Cerebulon
c28d64e91d Shantak Piss Fix 2018-02-05 06:56:24 +00:00
Anewbe
3e31b6678f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes 2018-02-05 00:53:33 -06:00
Anewbe
67e22cf0a6 Closets and Mechs no longer prevent death by freefall 2018-02-05 00:53:12 -06:00