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
Aronai Sieyes
f36f32afc0
Merge pull request #2970 from VOREStation/aro-admenucleanup
...
Remove several admin verbs from context menu
2018-02-04 16:27:33 -05:00
Arokha Sieyes
fbb34ea0ed
Remove several admin verbs from context menu
2018-02-04 12:32:55 -05:00
Arokha Sieyes
13bfcf6bd3
Improve admin idlekick capability/awareness
2018-02-04 01:05:03 -05:00
Arokha Sieyes
5a9119de99
POLARIS: Improves idle-kick admin awareness
2018-02-04 01:00:25 -05:00
MarinaGryphon
72318d46b6
Replaces most of the gender macros. ( #4681 )
...
* Fixes #4632 .
* 1:27 am coding best coding
* fixes a warning
* Removes the last of the gender macros. Gender is dead.
* gender II: the travis-ing
* linebreaks are dead too.
* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Leshana
f6f3abe5ec
Make ghosts invisible again.
2018-01-30 23:36:57 -05:00
Leshana
5a2162a264
Preliminary implementation of ZAS as a StonedMC subsystem.
...
* Creates the SSair subsystem which replaces the Setup, Start(), and Tick() procs of air_master.
* It may be best to have SSair completely replace air_master, but for now we are having them work together. It does completely replace the old processScheduer air ticker however.
* Remove the obsolete Setup and Tick procs.
* Adjust admin and debug verbs that dealt with some ZAS internals to work with the new implementation.
2018-01-30 12:28:45 -05:00
Arokha Sieyes
201ef9523c
Removes obsolete assistant ratio code, fixes nonconstant declaration
2018-01-29 01:22:41 -05:00
Leshana
27c3272821
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
...
# Conflicts:
# code/ZAS/_docs.dm
# code/__defines/mobs.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/game/turfs/simulated/walls.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/life.dm
# code/modules/mob/living/living_defines.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/southern_cross/southern_cross_jobs.dm
# vorestation.dme
2018-01-27 23:08:53 -05:00
Leshana
4c8bce00b4
Preliminary implementation of ZAS as a StonedMC subsystem.
...
* Creates the SSair subsystem which replaces the Setup, Start(), and Tick() procs of air_master.
* It may be best to have SSair completely replace air_master, but for now we are having them work together. It does completely replace the old processScheduer air ticker however.
* Remove the obsolete Setup and Tick procs.
* Adjust admin and debug verbs that dealt with some ZAS internals to work with the new implementation.
2018-01-27 01:59:24 -05:00
Cameron653
2692c92448
Makes Man Up have an alert ( #4609 )
...
* Makes Man Up have an alert
bECAUSE WHEN I EXAMINE SOMEONE I DON'T WANT TO ACCIDENTALLY TELL THEM TO MAN UP
* Update admin_verbs.dm
2018-01-22 15:05:07 -06:00
Arokha Sieyes
5d6d0bae15
Adds an admin verb to toggle it easier
2018-01-21 21:45:36 -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
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
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
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
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
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
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
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
killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
Anewbe
d0d840082a
Adds an event_manager chat channel
2017-09-17 19:48:51 -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
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
Cameron653
9f99603011
Update admin_verbs.dm
2017-09-03 11:10:27 -04:00
Cameron653
c7266f9cd8
Allows admins w/ debug access to restart the server easily
2017-09-03 11:09:40 -04:00
killer653
2e153d876a
Gives admins with R_ADMIN their quicknif verb
2017-08-09 17:43:54 -04:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00