Commit Graph

30974 Commits

Author SHA1 Message Date
Leshana
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
Leshana
4457c2ffd2 Merge pull request #3111 from VOREStation/aro-say2
say() safety check on client
2018-02-23 18:06:59 -05:00
Arokha Sieyes
fc3aca384a say() safety check on client
Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.
2018-02-23 15:56:16 -05:00
Anewbe
63667c4a02 Merge pull request #4927 from VOREStation/pol-gun
Fix mode_name on guns always being null
2018-02-23 13:18:36 -06:00
Anewbe
b58b4fcfde Merge pull request #4928 from VOREStation/pol-join-order
Create humans ON their spawn points
2018-02-23 13:18:28 -06:00
Anewbe
328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine
Make gas turbine constructable and operational
2018-02-23 13:16:56 -06:00
Anewbe
849ef9a8d6 Merge pull request #4925 from VOREStation/vplk-tesla-grounding
Tweak Tesla Grounding Rods
2018-02-23 13:16:46 -06:00
Anewbe
a3ce499607 Merge pull request #4924 from VOREStation/vplk-atmos-trinary
Eliminate duplicate code in trinary atmos components
2018-02-23 13:16:37 -06:00
BillyBangles
8f8f692ea0 Makes a dark ritual even darker (#4923)
* makes a dark ritual even darker

* makes the dark ritual maybe not THAT dark

* tweaks rune icon
2018-02-23 13:16:26 -06:00
Aronai Sieyes
210c16590a Merge pull request #3107 from VOREStation/aro-kinscoop
SA's with hands can scoop mobs
2018-02-23 00:22:38 -05:00
Aronai Sieyes
72335bb82b Merge pull request #3105 from VOREStation/aro-zshadfix
Zshadows should be as invisible as their origin
2018-02-23 00:07:19 -05:00
Aronai Sieyes
4f5a5bde0b Merge pull request #3106 from VOREStation/aro-invistweak
Allow alteration of mob default see_invisible
2018-02-22 23:56:43 -05:00
Arokha Sieyes
08c0a64fec SA's with hands can scoop mobs 2018-02-22 23:48:15 -05:00
Leshana
bff5e15ea0 Merge pull request #3103 from VOREStation/aro-gunfix
Fix mode_name on guns always being null
2018-02-22 23:14:33 -05:00
Atermonera
0f2ef45d71 Merge pull request #4922 from Anewbe/flashbang_stun
Should actually fix the flashbang thing, hopefully without a billion extra commits
2018-02-22 20:11:02 -08:00
Atermonera
4e9a1a0fba Unobfuscates GPS locations (#4910)
* Makes GPS units more useful, adds helper to give more useful dir strings

* Re-obfuscates PoI gps locations

They keep adir direction though, so finding them should generally be easier

* Re-obfuscates PoI gps locations
2018-02-22 22:10:18 -06:00
Aronai Sieyes
88d66357ec Merge pull request #3100 from VOREStation/vplk-atmos-trinary-tvalves
Eliminated more duplicate code in trinary components: Rondo of T-Valves
2018-02-22 23:08:54 -05:00
Arokha Sieyes
ef18bc7ff1 POLARIS: Allow alteration of mob default see_invisible 2018-02-22 23:01:16 -05:00
Arokha Sieyes
54ae568b37 POLARIS: zshadows should be as invisible as their origin 2018-02-22 22:36:39 -05:00
Atermonera
7f12366cc8 Merge pull request #4862 from Anewbe/steals_more_armor
Adds/steals more armor code, inventory changes
2018-02-22 18:55:01 -08:00
Atermonera
4a0acb27f1 Merge pull request #4909 from Anewbe/two_handed_guns
Ports more two-handed gun sprites from Bay
2018-02-22 18:27:23 -08:00
Anewbe
d7b7a1be00 Merge pull request #4919 from AbbieFland/pai-communicator
Fixed pAI communicator buttons.
2018-02-22 20:26:50 -06:00
Anewbe
ac43a54254 Merge pull request #4918 from Mechoid/Mob_Spawners
Adds a few random mob spawners.
2018-02-22 20:26:01 -06:00
Atermonera
9993031500 Merge pull request #4917 from Anewbe/surgery_oversight
Corrects an oversight with surgery and defibs
2018-02-22 18:25:04 -08:00
Anewbe
0c75b3e634 Merge pull request #4916 from VOREStation/pol-hudfix
Critters Can Crawl Carrying Client Constructs
2018-02-22 19:19:28 -06:00
Arokha Sieyes
1720cd54f3 Create humans ON their spawn points
Instead of moving them there later.
2018-02-22 20:14:39 -05:00
Arokha Sieyes
3680b0382a POLARIS: Fix mode_name on guns always being null 2018-02-22 20:03:54 -05:00
Arokha Sieyes
9544074b50 POLARIS: Fix mode_name on guns always being null 2018-02-22 19:58:19 -05:00
Aronai Sieyes
2315541c22 Merge pull request #3096 from VOREStation/aro-imagecleanup
Improve two image cleanups
2018-02-22 19:35:42 -05:00
Aronai Sieyes
8080722399 Merge pull request #3097 from aztectornado/siren
Adds Siren jumpsuit
2018-02-22 19:32:09 -05:00
Atermonera
410aca398e Adds halogen counter tool, adds gas scanner to analyzers (#4903)
* Adds halogen counter tool, adds gas scanner to analyzers

* Appeases travis

* Missed a tag
2018-02-22 15:01:25 -06:00
Leshana
a1bfd1fb46 Make gas turbine constructable and operational
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
2018-02-22 15:43:38 -05:00
Leshana
364c0253dc Tweak Tesla Grounding Rods
Grounding rods that are anchored can be struck two turfs farther away than unanchored.  This makes it possible to leapfrog towards a tesla because an unanchored one can be protected in the "shadow" of the anchored one.
2018-02-22 15:32:31 -05:00
Leshana
ba36595263 Consolidated digital t-valves type paths.
- Because mirroring is now *much* easier to setup than digital remote control, we reverse the order of inheritance to de-duplicate all the radio code from digital t-valves!
- This requires changing the following type paths:
    /obj/machinery/atmospherics/tvalve/mirrored/digital  -> /obj/machinery/atmospherics/tvalve/digital/mirrored
    /obj/machinery/atmospherics/tvalve/mirrored/digital/bypass -> /obj/machinery/atmospherics/tvalve/digital/mirrored/bypass
- Change made on all maps.

- We can eliminate any overriden methods at all on flipped trinary devices by making a `mirrored` and `tee` variable!  This allows us to do things like flip them without delete/spawning.
- T-Valves are also basically trinary.  Sadly they are not a subtype, so to share code with them I have to put it into an outside proc.  But still worth it.
2018-02-22 15:11:55 -05:00
Leshana
1d3697c68a Went even farther in consolidation of trinary atmospherics.
- We can eliminate any overridden methods at all on flipped trinary devices by making a `mirrored` and `tee` variable!  This allows us to do things like flip them without delete/spawning.
- T-Valves are also basically trinary.  Sadly they are not a subtype, so to share code with them I have to put it into an outside proc.  But still worth it.
2018-02-22 15:10:43 -05:00
Leshana
b70451cda6 Eliminated duplicate code in trinary components.
- Consolidate common functions into trinary_base
- The only real difference in atmos_init was which direction each node would connect in.  Delegated that to an overridable proc, and the rest can be consolidated. Same story for update_underlays()
- Used similar patterns on tvalves which also are trinary even tho they are not subtyes of trinary (for some reason)
2018-02-22 15:10:29 -05:00
Leshana
086d7f9d3e Consolidated digital t-valves type paths.
- Because mirroring is now *much* easier to setup than digital remote control, we reverse the order of inheritance to de-duplicate all the radio code from digital t-valves!
- This requires changing the following type paths:
    /obj/machinery/atmospherics/tvalve/mirrored/digital  -> /obj/machinery/atmospherics/tvalve/digital/mirrored
    /obj/machinery/atmospherics/tvalve/mirrored/digital/bypass -> /obj/machinery/atmospherics/tvalve/digital/mirrored/bypass
- Change made on all maps.

- We can eliminate any overriden methods at all on flipped trinary devices by making a `mirrored` and `tee` variable!  This allows us to do things like flip them without delete/spawning.
- T-Valves are also basically trinary.  Sadly they are not a subtype, so to share code with them I have to put it into an outside proc.  But still worth it.
2018-02-22 15:00:32 -05:00
Leshana
fefbcf6ba2 Went even farther in consolidation of trinary atmospherics.
- We can eliminate any overridden methods at all on flipped trinary devices by making a `mirrored` and `tee` variable!  This allows us to do things like flip them without delete/spawning.
- T-Valves are also basically trinary.  Sadly they are not a subtype, so to share code with them I have to put it into an outside proc.  But still worth it.
2018-02-22 14:58:28 -05:00
Aronai Sieyes
db62300a17 Merge pull request #3078 from Screemonster/moremeramods
Adds "monster tamer" drink, plus some chimera tweaks.
2018-02-22 13:15:40 -05:00
Aronai Sieyes
26392c09f8 Merge pull request #3094 from VOREStation/aro-spa
Add adminload Spa map, tweaks
2018-02-22 12:36:36 -05:00
Aronai Sieyes
6fc64be1a8 Merge pull request #3091 from VOREStation/Cameron653-patch-1
Adds a toggle to the bluespace jumpsuit
2018-02-22 12:33:16 -05:00
Aronai Sieyes
46e63af4b0 Merge pull request #3093 from VOREStation/exp-atmos-trinary
Eliminated duplicate code in trinary components.
2018-02-22 12:32:52 -05:00
Aronai Sieyes
0d4452e78f Merge pull request #3098 from VOREStation/vplk-candles
Stop candles from messaging the universe when they light.
2018-02-22 12:27:58 -05:00
Aronai Sieyes
94cdc508bc Merge pull request #3068 from VOREStation/vplk-timeclock-i
Adds Timeclock Terminals: A machine for viewing your PTO balance.
2018-02-22 12:27:09 -05:00
Leshana
effd302072 Stop candles from messaging the universe when they light. 2018-02-22 10:17:49 -05:00
Aztectornado
105f986db1 Adds Siren jumpsuit 2018-02-22 06:00:41 -06:00
Anewbe
51420a0aa7 Flashbangs no longer Stun() 2018-02-22 02:20:25 -06:00
Anewbe
8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Mechoid
a47ce58f0a Merge pull request #4905 from Anewbe/zheng-hu
Zheng Hu Improvements
2018-02-21 21:19:04 -08:00
Mechoid
1de47d364c Merge pull request #4899 from Anewbe/rad_anomaly
Weakens the random mining radbursts
2018-02-21 21:17:59 -08:00