Commit Graph

387 Commits

Author SHA1 Message Date
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Mars
bedaad976f Ensure admin\topic.dm uses mostly locateUID 2018-08-17 20:06:22 +02:00
Mars
6a77df8792 UID usage for a number of hrefs.
There should be only UID usage now for the hrefs: adminmoreinfo,
adminplayerobservefollow, adminplayeropts, vars, subtlemessage, traitor,
BlueSpaceArtillery, CentcommReply, SyndicateReply, adminspawncookie,
priv_msg, revive, follow.
2018-08-17 12:31:26 +02:00
Mars
4fa906951a Use of the flexible macro
Mostly regex to catch every \ref with the same formatting, with their
reference and display name.
2018-08-16 20:04:53 +02:00
Aurorablade
14469c35c9 Formats the HM 2018-08-14 21:30:01 -04:00
Crazy Lemon
efb582412d Merge pull request #9298 from Aurorablade/Headsets
Slight TG Headset Communication port
2018-08-05 11:30:50 -07:00
Aurorablade
b81f61ae58 Fixes 2018-08-04 23:27:20 -04:00
Aurorablade
e8bb3451db Stop making Late night PRs fethas 2018-08-02 02:22:02 -04:00
variableundefined
9c2e725e4b Fixes some more runtime 2018-08-01 17:44:09 +08:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Birdtalon
b66c6f54c3 removed repeated span 2017-10-02 23:51:35 +01:00
Birdtalon
ef0b899e43 tidying up styling, migrated some functions, final changes 2017-10-02 23:36:24 +01:00
Birdtalon
550db12717 user feedback, updates adminhelp string, replying to a ticket stops stale counter 2017-10-01 23:18:51 +01:00
Kyep
b00ca3045a Fixes rogue characters 2017-06-28 00:34:54 -07:00
Kyep
31723393d2 Fixes merge conflict 2017-06-27 22:11:23 -07:00
Fox McCloud
260385b1f6 Merge pull request #7543 from Kyep/gamma_pod
Updates Gamma Ship
2017-06-27 15:28:41 -04:00
Kyep
6810e5f57e Fixes #7635 2017-06-25 14:20:32 -07:00
Kyep
0d87ef1591 PP, too 2017-06-14 04:12:00 -07:00
Kyep
fea7e56d63 Requests on the PR 2017-06-13 23:09:50 -07:00
Kyep
3e60634dc3 Updates Gamma Ship 2017-06-13 02:41:45 -07:00
Kyep
5c2aa2208e Changed to list players, and have individual cryo buttons 2017-06-12 00:20:18 -07:00
Kyep
604270a44f More Smiting
Updates the admin "smite" command, adding several new options for
dealing with people who keep annoying the gods with requests for
freebies:
- Mutagenic & hellwater cookies are now NODROP, so not as easy to get
rid of.
- Adds a 'Hallucinate' option, which triggers chronic hallucinations.
- Adds a 'Starvation' option, which causes chronic hunger. (and
slowdown)
- Adds an 'Assassin' option, which creates a new traitor with an
objective to kill them.
- Adds a 'Lynch' option, which gives everyone without mindshields a
directive to kill them.
- "Bless" and "Smite" now show up as options in the player panel.
2017-06-04 20:20:51 -07:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Markolie
a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Tigercat2000
836d07189c Added config toggle + admin verb to disable OOC emoji (not PM) 2017-01-11 09:54:15 -08:00
Markolie
f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Crazy Lemon
7e0183f23f Merge pull request #5224 from Kyep/jobs_unlock_system
Playtime Tracking
2017-01-03 18:06:28 -08:00
Markolie
01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Fox McCloud
287226fa19 Merge pull request #5858 from Markolie/grammarnazi
Verb category changes, telecoms verb fix
2016-12-07 12:33:36 -05:00
Crazy Lemon
51822ab940 Revert "Revert "Makes the admin logout tracking system actually work"" 2016-12-03 02:23:18 -08:00
Crazy Lemon
c8f54b4d53 Revert "Makes the admin logout tracking system actually work" 2016-12-03 01:53:47 -08:00
Kyep
65761b7ac1 Adds UID support 2016-11-28 22:39:04 -08:00
Kyep
7b20d7561e Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system 2016-11-28 22:19:27 -08:00
Kyep
3865213358 Crazylemon changes
- Adds UID
- Removes cats
- Adds .Join
2016-11-28 22:19:07 -08:00
Crazylemon64
8271a89dab Makes the admin logout tracking system actually work 2016-11-27 12:00:57 -08:00
Fox-McCloud
fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
Markolie
cff0528673 Verb category changes, telecoms verb fix 2016-11-08 16:23:13 +01:00
Markolie
2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Kyep
7e613798b0 Fixes merge conflict in admin_verbs.dm 2016-10-01 13:26:24 -07:00
Krausus
b0ac462166 Integrates UIDs into View Variables 2016-09-08 19:04:50 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
GeneralChaos81
825670e29c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MechBay
commit.
2016-08-17 14:47:24 +10:00
GeneralChaos81
37a9c67560 Corrected points Fox raised. Updated nanoUI for the new screen. 2016-08-15 15:58:23 +10:00
GeneralChaos81
b4ce757613 Ported TG's mechbay. Functional. Still can't make/break mechbay floors. No nanoUI yet. Unsure what the effects of commenting that line in admin.dm is. 2016-08-12 15:09:32 +10:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00