Commit Graph

2237 Commits

Author SHA1 Message Date
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Leshana
0e6f2fcb09 Make Singulo Stable Again (#4521)
* Make Singulo Stable Again

* Prevents emitter beam effects from being pulled by singulo.  Now watch them hit the field gens.
* Prevent singulo from consuming the PA particle effects.  It already gets fed by impact, don't try to eat them.
* Improve the Setup Singularity debug verb to do more better setup (including PA)
* Fix the energy dissipation values so that singularity does not just keep on growing even when setup properly.

* Enhance singularity proc/eat()

* Use `var/simulated` as a more generic way to ignore lighting overlays etc
* Remove redundant code in the rest of the proc body.
* Slight optimization: avoiding typecheck in loop over return from orange()
2018-01-13 21:43:32 -06:00
Anewbe
4c17f28cd0 Merge pull request #4519 from Neerti/12/15/2017_berserking
Adds Berserk
2018-01-11 20:57:50 -06:00
Neerti
cca2cc5a23 Adds Berserk 2018-01-11 01:35:14 -05:00
Arokha Sieyes
b9e8b9641c Various and sundry admin messages 2018-01-06 19:15:54 -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
Leshana
a1734c97e9 Moved makepowernets() into SSmachines initialization proc. 2017-12-29 15:32:06 -05:00
Leshana
5ebcc92645 Port /tg garbage collection tweaks and statistics improvements
https://github.com/tgstation/tgstation/pull/30118 - Garbage collection tweaks and refactors.
https://github.com/tgstation/tgstation/pull/32022 - Find references fix.
2017-12-27 21:45:37 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Belsima
3bf74de3b1 Grammar time, again. (#4402)
* Shriek grammar.

* Updates jumpsuit grammar.

* Update civilian.dm

* Update NewBan.dm

* Update gravitygenerator.dm

* Update Dreaming.dm

* Update shriek.dm

* Update NewBan.dm
2017-12-05 14:34:45 -06:00
Anewbe
21ae066f6c Merge pull request #4367 from Neerti/11/28/2017_variable_click_delay
Adds Variable Click Delay
2017-11-29 12:53:15 -06:00
Anewbe
b07ac2e6fa Readds the check_new_players admin verb 2017-11-28 17:42:35 -06: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
Belsima
3320690a1e I before E (#4287)
* except after C

* maroonic mistake

* Improved use of sound files.

Also more grammar.

* now with less fuckup
2017-11-19 03:00:14 -06:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
elgeonmb
50d29cbb4e fixes minor typo in admin_verbs.dm 2017-11-11 02:30:24 -08:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Anewbe
c430275c31 Actually gives Event Managers ESAY 2017-11-05 23:06:11 -06:00
Anewbe
ae6583e5fb Cleans up some Event Manager code 2017-11-03 16:24:36 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
7963f539db Hopefully fixes ahelps 2017-10-21 23:27:24 -05:00
Anewbe
3f2d996f7d Improves Halloween costumes, tweaks the admin verb for equipping 2017-10-20 16:01:09 -05:00
Anewbe
cad5ef12e7 Does work on the event manager role again 2017-10-18 20:00:01 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
d42edb679b Merge pull request #4069 from Anewbe/costumes
Halloween Costume Outfits
2017-10-16 19:01:25 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
Anewbe
0741b45570 Adds costumes, improves admin outfit verb 2017-10-14 02:19:13 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
2017-10-04 20:08:55 -05:00
Anewbe
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Anewbe
c2c6b5949a Does more prep for the Event Manager role 2017-10-02 21:51:48 -05:00
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
Anewbe
1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Anewbe
dcf4a6bfea Adds give-modifier to the debug verb list 2017-09-27 01:16:04 -05:00
Anewbe
215c080b1e Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines
Adds Recently Cloned Modifier to Cloners
2017-09-26 19:09:12 -05:00
Anewbe
d0a175994d Adds more channels to intercom msg 2017-09-24 02:00:58 -05:00
Neerti
23bf9a3ff4 Merge pull request #3864 from Anewbe/engine_setup
Implements the correct setup_supermatter verb
2017-09-22 19:29:53 -04:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Spades
07762f31e7 Some disorganizes changes by Aces
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04:00
Anewbe
d0d840082a Adds an event_manager chat channel 2017-09-17 19:48:51 -05:00
Anewbe
f7ff4669d9 Implements the correct setup_supermatter verb 2017-09-17 17:18:52 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port
Port's TG's Maploader
2017-09-11 17:17:23 -04:00
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00