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
Kyep
62bc56a080
Adds jani/paranormal ERT and more
2017-06-26 01:55:15 -07:00
Kyep
ce48a277df
Support protective hunters, guardian/pet blessings
2017-06-24 00:04:15 -07:00
Fox McCloud
19a932ddfa
Merge pull request #7551 from Kyep/ga_smitebless
...
Changes Smite/Bless to require R_EVENT permissions
2017-06-23 01:08:52 -04:00
Kyep
250b64edb2
Changes Dark Priest to Hunter
2017-06-18 23:48:51 -07:00
Kyep
ec3e3417ef
Changes Smite/Bless to require game admin permissions
2017-06-14 04:03:40 -07:00
Sam
fca8a46c49
Fixes errant improper capitalised references
2017-06-14 08:00:18 +01:00
Kyep
5c2aa2208e
Changed to list players, and have individual cryo buttons
2017-06-12 00:20:18 -07:00
Fox McCloud
110778795c
Merge pull request #7486 from Alexshreds/meta
...
Mhelp Fix
2017-06-09 19:47:50 -04:00
Kyep
e29bd33637
DP's Radio & Pinpointer are now NODROP.
2017-06-08 22:12:56 -07:00
Kyep
b241af77b8
Added 'Priest' option
2017-06-07 00:32:35 -07:00
Kyep
4f66591eee
Fox requests
2017-06-06 20:08:59 -07:00
Chakirski
abbee964a1
meta
2017-06-06 14:34:07 -05:00
Kyep
efd4bb5594
Fox requests
2017-06-04 21:29:25 -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
Mark van Alphen
b0ded4b821
Merge branch 'master' into findnreplace
2017-03-05 12:09:52 +00:00
Kyep
b0a6ad2241
Removes "src."
2017-02-21 22:06:06 -08:00
Markolie
6982014a6e
Replace all BYOND text macros
2017-02-21 15:41:37 +01:00
Kyep
cae061dcf0
Tigercat request
2017-02-20 17:54:43 -08:00
