Commit Graph

2567 Commits

Author SHA1 Message Date
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
SteelSlayer
0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Mark van Alphen
6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud
3eb4ad0ed5 Maintainers Have No Sense of Right or Wrong (#12381) 2019-09-24 15:15:05 -07:00
Dave
2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayer
94bb14bb29 Datumizes traitors and mindslaves (#11969) 2019-09-21 16:50:03 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Ty-Omaha
fb65835fa4 Removes custom admin event info verbs (#12355) 2019-09-20 18:14:06 -07:00
Ty-Omaha
9504c069fb Fixes Message Resolve in Admin/Mentorhelps (#12348) 2019-09-18 14:35:25 -07:00
Fox McCloud
6711f92099 Merge pull request #12326 from Couls/missing-keyword-args
fixes some missing arguments and runtimes
2019-09-17 21:03:11 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
variableundefined
845acf13ca Merge pull request #12298 from Ty-Omaha/adminHELP
Adminhelp update
2019-09-16 20:16:26 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud
d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -04:00
Ty-Omaha
3572de0fda minor fix 2019-09-15 16:06:18 -04:00
Ty-Omaha
eba6940b55 sound improvement 2019-09-15 14:10:14 -04:00
Ty-Omaha
f7eabb357c resolve 2019-09-14 23:40:34 -04:00
Ty-Omaha
16b65120ba adminhelp update 2019-09-14 22:41:21 -04:00
variableundefined
bccdd15b6d Merge pull request #12259 from Ty-Omaha/revert-11733-this-has-psised-me-off-long-enough
Revert "Adds Auto-Note for Manual Bans"
2019-09-10 21:54:40 -04:00
variableundefined
8077e61d08 Merge pull request #12241 from SteelSlayer/admin-verb-removals
Admin verb mega update
2019-09-10 19:38:00 -04:00
Ty-Omaha
240cf39025 Revert "Adds Auto-Note for Manual Bans" 2019-09-10 17:00:10 -04:00
xProlithium
829d1297cf CA to TP on adminpm and prayers
I missed changing CA to TP on these two folders.
2019-09-10 03:38:26 -04:00
SteelSlayer
4fb7d83595 re-add sticky ban, player_panel, increase width of ssd/afk window a bit 2019-09-09 10:12:58 -04:00
SteelSlayer
46ad75ec14 Revert "taking player_panel out to the woodshed"
This reverts commit 8fc8063c74.
2019-09-09 08:46:43 -04:00
SteelSlayer
8fc8063c74 taking player_panel out to the woodshed 2019-09-09 02:00:31 -04:00
SteelSlayer
275266a73a Admin verb mega update
changes/removes all sorts of admin verbs, requested by Kyet
2019-09-09 01:26:50 -04:00
xProlithium
04540c7b9b Changed ahelp CA to TP
Changed the CA link in admin helps to TP link. Also moved it further up.
2019-09-08 02:17:05 -04:00
variableundefined
854e5de97f Merge pull request #12206 from Fox-McCloud/refactors-corgis
Refactors Corgis and Other Doggos
2019-09-05 21:17:53 -04:00
Fox McCloud
10d3c7e463 Merge pull request #12117 from variableundefined/ResolvingProblem
Add a quick resolve button to mentor and adminhelp ticket
2019-09-05 20:06:16 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
SteelSlayer
da534b2df1 Round start delay works properly again 2019-08-28 19:20:44 -04:00
variableundefined
d25970e13a Add a quick resolve button to mentor and adminhelp ticket 2019-08-28 12:59:38 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy
Custom outfit manager and spawn with outfit on transform/reincarnate
2019-08-24 12:27:48 -04:00
variableundefined
a968dc6a09 Merge pull request #11936 from farie82/antidrop-remove-on-drop
Dropped anti drop items now lose the antidrop status if not initialized with it
2019-08-24 10:53:23 -04:00
variableundefined
a42226c112 Merge pull request #11691 from TDSSS/lavaland-fax
Gives lavaland syndie base a fax (+some small other changes)
2019-08-23 08:33:04 -04:00
Fox McCloud
e4ca25be3d Merge pull request #11998 from Tayyyyyyy/pm_window_links
Add links to ping and open conversation in window for PMs
2019-08-21 01:49:03 -04:00
Fox McCloud
5d9fc8e9ea Merge pull request #11985 from Tayyyyyyy/admin_pencode
Add admin pencode: style, class, and img
2019-08-14 22:22:34 -04:00
Tayyyyyyy
534a4ce3b9 Add links to ping and open conversation in window for PMs 2019-08-12 23:31:23 -07:00
Tayyyyyyy
f17798d95b FIx more garbled quotes 2019-08-12 22:08:08 -07:00
Tayyyyyyy
48c002b361 Add admin pencode: style, class, and img 2019-08-12 09:47:59 -07:00
variableundefined
c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker
Panic Bunker
2019-08-12 19:34:19 +08:00
variableundefined
635db54625 Merge pull request #11730 from farie82/afk-list
Adds a list AFK players verb for admins
2019-08-12 17:48:33 +08:00
variableundefined
0b469ce563 Merge pull request #11577 from farie82/mhelp-take
Ticket take now asks for a confirmation if it's already assigned + ticket/PM code refactor
2019-08-12 17:44:26 +08:00