cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,941 Commits 26 Branches 2 Tags
a24013be5b9cea17bcad4cb904cfdfdafe3d934d
Commit Graph

429 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
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud
d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -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
Ty-Omaha
240cf39025 Revert "Adds Auto-Note for Manual Bans" 2019-09-10 17:00:10 -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
275266a73a Admin verb mega update 
changes/removes all sorts of admin verbs, requested by Kyet
 2019-09-09 01:26:50 -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
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
variableundefined
d25970e13a Add a quick resolve button to mentor and adminhelp ticket 2019-08-28 12:59:38 -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
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
48c002b361 Add admin pencode: style, class, and img 2019-08-12 09:47:59 -07: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
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
joep van der velden
402d1ef131 No drop items now lose their nodrop if dropped 2019-07-29 00:03:18 +02:00
farie82
d6f6029147 Merge branch 'master' into afk-list 2019-07-28 23:43:37 +02:00
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Ty-Omaha
eb3f70684d reword the reword 2019-07-11 18:42:03 -04:00
Ty-Omaha
73a7bff8b3 Permaban 2019-07-11 16:58:02 -04:00
Mark van Alphen
6c58f9fcbb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lazy 
# Conflicts:
#	paradise.dme
 2019-07-08 19:37:54 +02:00
Ty-Omaha
118db59f61 autonote for manual bans finally 2019-06-17 09:07:10 -04:00
joep van der velden
250d1b6695 Now the correct place to warn them 2019-06-16 20:55:51 +02:00
joep van der velden
d25e85d5ea SEND_SOUND instead of the olden way 2019-06-16 11:47:06 +02:00
joep van der velden
1c8bdb0d7a Adds a list SSD players verb for admins 2019-06-16 11:33:57 +02:00
Mark van Alphen
3728e5efe4 More outfit improvements 2019-06-09 22:47:47 +02:00
Mark van Alphen
8234881a2a New custom outfit managers, select equipment refactor and spawn with outfit on transform/reincarnate 2019-06-09 21:46:41 +02:00
TDSSS
9e3030a740 Lets admins fax the syndies. 2019-06-06 17:26:41 +02:00
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Kyep
2726324dfa removes non-IP ban option for legacy bans, because DB bans won't honor it regardless 2019-04-13 12:51:34 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00