Mars
984339ce42
Merge-conflict fix + check for null rather than type.
2018-10-12 18:59:54 +02:00
Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
Mars
d9b60a7bfb
Fix merge conflict
2018-10-09 09:41:37 +02:00
Birdtalon
074ee967e5
Merge branch 'master' into ERT-changes
2018-10-07 19:22:10 +01:00
Desolate
4c062212ab
refactors global lists.
2018-10-06 08:02:45 -05:00
Purpose
ea74920535
no no no no cyberiaaaaad
2018-10-05 20:57:41 +01:00
Desolate
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
variableundefined
f923a2a48b
Merge pull request #9419 from Birdtalon/ticketrefactor
...
Tickets 2: The ticketting - Converts tickets to subsystem + extra
2018-10-01 16:20:46 +08:00
Birdtalon
c72561d194
addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines
2018-09-29 20:29:26 +01:00
variableundefined
bc22544919
Port Shuttle to StonedMC
2018-09-02 22:22:33 +08:00
Unknown
dc0df1df66
fixes admin prison
2018-08-28 10:39:06 +02:00
Birdtalon
ee908a9554
refactors admin tickets system to subsystem
2018-08-26 15:15:25 +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
a5c9cfd1cb
Fixes and polishes fax radio replies
...
Can use the radio option to reply to faxes again.
Centcomm doesn't reply over radio to syndicate faxes.
Removes unreachable code.
2018-08-12 12:00:32 +02: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
Fox McCloud
aae5405d03
AGHHHHHHHHHHHHHHHHHHH WHATTT
2018-07-17 04:58:36 -04:00
tigercat2000
f31d79a961
Merge pull request #9064 from Anasari/MoreClickAntag
...
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
2018-06-13 18:43:18 -07:00
Anasari
d9d9857f57
Remove redundant src and upper limits
2018-06-14 07:23:40 +08:00
Fox McCloud
5fb13096a2
Merge remote-tracking branch 'upstream/master' into weather-subsystem
...
# Conflicts:
# code/__DEFINES/layers.dm
2018-06-13 16:56:19 -04:00
Tayyyyyyy
170266d827
More pronouns
2018-05-25 18:34:23 -07:00
tigercat2000
ea44afdebe
Merge pull request #9025 from Anasari/BombToInvestigate
...
Move bombing list to investigate & improve bomb logging
2018-05-25 17:58:13 -07:00
Ansari
7cb0b6fafe
Add number of antags to create option to some one-click antag. Add make_vampire() function, fixes some typos
2018-05-23 21:13:09 +08:00
Fox McCloud
6cdfe70303
Converts and Updates Weather Subsystem
2018-05-21 00:01:18 -04:00
Ansari
2e870f8038
Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function.
2018-05-17 23:14:29 +08:00
Fox McCloud
5df7dfdaac
Preps the Way for Datumized Antags
2018-05-15 21:55:44 -04:00
Fox McCloud
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
Fox McCloud
1d80bf01c0
Merge remote-tracking branch 'upstream/master' into gc-ss-port
...
# Conflicts:
# paradise.dme
2018-04-03 18:21:04 -04:00
Fox McCloud
7f842e3223
no more runtimes
2018-03-29 00:44:53 -04:00
tigercat2000
affc986684
Fix time shit & Add secrets verb
2018-03-26 20:16:22 -07:00
Aurorablade
59cbd79cc3
Fine, no typo
2018-03-13 22:31:27 -04:00
Aurorablade
2a3dd305a9
Obscure Admin Related fixes
2018-03-13 22:22:51 -04:00
Fox-McCloud
6ec234430e
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
# code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
tigercat2000
12949e24f8
Merge pull request #8184 from Birdtalon/ticket-machine
...
Birdtickets: Adminhelp based ticket system
2017-10-27 09:24:06 -07:00
Kyep
faa6788b80
"var X" -> "var/x"
2017-10-19 08:28:31 -07:00
Kyep
5f66da051a
Also tells you if you're toggling on/off
2017-10-16 22:20:48 -07:00
Kyep
168f6799db
Tiger
2017-10-16 20:38:46 -07:00
Kyep
6f5160775b
Permissions Panel Loop
2017-10-16 20:31:59 -07:00
Birdtalon
550db12717
user feedback, updates adminhelp string, replying to a ticket stops stale counter
2017-10-01 23:18:51 +01:00
Fox-McCloud
003277a89d
Merge remote-tracking branch 'upstream/master' into lungsss
2017-09-17 01:02:33 -04:00
Fox McCloud
13c112358a
Merge pull request #7534 from Kyep/ssd_button
...
Admin 'List SSDs' verb & cryo option
2017-08-16 19:58:52 -04:00
Fox-McCloud
4479185d6e
Merge remote-tracking branch 'upstream/master' into lungsss
2017-08-16 19:20:19 -04:00
Fox-McCloud
9d14e6c9da
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/life.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station.dm
# code/modules/surgery/surgery.dm
2017-08-05 19:03:52 -04:00
Kyep
568874ed6a
Fixes #7925 for smite/bless and SIT
2017-08-05 01:58:53 -07:00
Fox McCloud
d4f305cc72
Merge pull request #7583 from Kyep/smite_hunter
...
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Kyep
de56e4bf59
Removed is_hunter_outfit
2017-07-19 02:03:21 -07:00
Fox-McCloud
77375fc1c4
Breathing is Now Handled on Lungs
2017-07-19 03:28:21 -04:00
Kyep
31723393d2
Fixes merge conflict
2017-06-27 22:11:23 -07:00
