635013f331
Merge branch 'virgoMaster' into virgoPull
2018-06-10 12:33:29 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
6b4be2d7a8
Paranoid logging and byond account age
...
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.
PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.
Also makes this information available in player panel. Requires SQL connection.
2018-05-22 23:03:53 -04:00
a384e78dd0
Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation
2018-05-20 01:32:22 +01:00
e7822eb506
Adds in the Discord Verification system and fixes the bot~
2018-05-20 01:32:12 +01:00
86eac9c0b1
Implement rust-g library
2018-05-04 18:58:31 -04:00
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
446e0f30e3
Configuration option for time_off
2018-01-28 23:27:21 -05:00
9ca5337c98
PTO Implementation
...
* Adds SSpersist which updates people's PTO balance every 15 minutes
* Adds "Off-duty" jobs which can only be taken if you have enough PTO.
2018-01-28 23:27:21 -05:00
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
3eb479b85f
Merge pull request #4468 from Neerti/12/29/2017_the_resource_war
...
Might Fix Resource Lag
2017-12-29 18:05:42 -08:00
68a4ea95ba
Might Fix Resource Lag
...
Removes the dynamic setting of preload_rsc, because BYOND does not appear to respect it if it's not compiled in, and the dynamic nature of it is unused to my knowledge. If you need to change it, you can change a define in _compile_options.dm
This should now properly set it to '1', which should load all the resources at once, which might make some significant slowdown when first connecting, but should be preferable to constantly getting mini-lags when moving to new areas or hearing new sounds (like when getting shot at!).
2017-12-29 03:58:25 -05:00
a435d73450
Ports /tg controller optimizations
...
https://github.com/tgstation/tgstation/pull/31092 - Fixes subsystems not returning a qdel hint
https://github.com/tgstation/tgstation/pull/31494 - In which the stoner one gets stoned and tries to address tick contention... again
https://github.com/tgstation/tgstation/pull/31950 - Removes an empty New()
https://github.com/tgstation/tgstation/pull/31951 - Logs subsystem shutdowns
2017-12-27 21:19:55 -05:00
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
97957fcaee
Replaces more macros. ( #3647 )
...
* MORE MACRO CHANGES
AHHHHHHHHHHHHHHHHHHHH
* Fixes a few typos
* Fixes compile error
* Fixes for real
* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
7b47590645
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
69a50ec225
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
...
# Conflicts:
# code/_macros.dm
# code/controllers/master_controller.dm
# vorestation.dme
2017-06-09 22:54:16 -04:00
ebe5cc916d
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
b17fb86721
Tweaks Statpanel and System Initialization
2017-06-01 21:42:08 -04:00
42998da918
Fix 'if' statement on Panic Bunker
...
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:13:54 -04:00
66327aecc7
Quick & Dirty Panic Bunker Port
...
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
2017-04-11 00:13:43 -04:00
ba1221889c
Fix 'if' statement on Panic Bunker
...
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:12:32 -04:00
b3d652fa50
Quick & Dirty Panic Bunker Port
...
Should work! Should.
2017-04-10 22:38:58 -04:00
e7d8af7ae7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/mob/mob.dm
# html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
eabefc538a
Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
...
This reverts commit 6bb5409349f6a83d5ee0
2016-08-15 12:58:00 -04:00
f50adb9554
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
...
Conflicts:
code/_helpers/time.dm
code/modules/economy/ATM.dm
2016-08-09 15:46:24 -04:00
85c3e22873
Polaris sync
2016-08-06 20:34:44 -07:00
0f830b0f98
no message
2016-08-05 17:58:15 +01:00
4d74a8f5c2
Various fixes.
...
Client Login() now calls ..() before setting up preferences, ensuring a mob has actually been assigned. Fixes #12560 (and probably other somehow subtle sanitation issues).
The alien whitelist now checks the rights of the supplied mob, not usr.
When granting xeno loadout gear the mob's current species must match the gear's whiteliste species.
2016-08-05 17:35:43 +01:00
2e25267791
Adds SolGov logo to Paperwork and SolGov Stamps
2016-07-21 15:29:08 -04:00
484fb96202
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
# Conflicts:
# .travis.yml
# code/game/machinery/adv_med.dm
# code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
4fa126b7e7
a whole lot of nanoui upgrades
2016-06-24 00:43:16 -04:00
da3e206c1c
MakeGreed correction
...
Corrected according to PsiOmegaDelta, whom I trust blindly on this one
2016-06-18 17:22:03 -03:00
2de751a8ee
Readded the click Catcher
...
To avoid losing the click catcher on the reloging
there we go, proper credits to
https://github.com/PsiOmegaDelta
2016-06-18 16:39:21 -03:00
7ab5220f64
510 Improved Overlays
...
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.
I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.
Ported from:
https://github.com/Baystation12/Baystation12/commit/7c2cc890abf840b1a9967bc26c36581301e7229c
2016-06-18 15:50:10 -03:00
76567bb7a2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
# Conflicts:
# code/modules/mob/living/carbon/human/whisper.dm
Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
2016-05-26 09:59:18 -04:00
77ee2215e7
Removes unused and unnecessary spam prevention
2016-05-26 04:24:18 +01:00
8230732453
Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync
2016-05-19 23:52:00 -04:00
a87c8de3fd
HTML5 and CSS3 ( #1677 )
...
* Updates to HTML5 and CSS3
* UI Tweaks and Fixes
2016-05-19 14:28:38 -04:00
2dfd8858a9
More work towards saving
2016-05-08 17:24:38 -04:00
9c21e0bcdc
Manually ports /tg/'s darkclick code.
...
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
2016-04-08 23:07:10 -04:00
f41f52dea8
Removes topic limiter
2016-03-21 16:28:15 +03:00
f20713e668
Adds a timer to staffwho AFK notifications.
2016-02-27 21:57:40 +00:00
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
df0188662c
Character setup tweaks.
...
Adds client verb to access the character setup screen from anywhere.
Moves name validation to species level, making it possible for IPCs to have numbers in their name.
Adds gender validation, also adds support to add neuter/plural genders in the future if ever desired.
Now sanitizes preferences before applying them to a mob.
Fixes #11433 .
(cherry picked from commit e40246e9df
2015-11-20 07:50:12 -05:00
aa3a62fe32
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-19 08:59:24 +01:00
Reddeyfish