Commit Graph
18244 Commits
Author SHA1 Message Date
Markolie e95eb8f3b8 Let admins create server polls 2015-09-23 20:17:21 +02:00
Markolie cab53d90bf Parenthesis 2015-09-23 08:16:17 +02:00
Markolie b4a4f29f3f Vox/Plasmaman spawn/wizard update 2015-09-23 08:14:12 +02:00
Markolie 9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie 73bacbf17f Preference option for instruments/sanitize tempo 2015-09-23 07:00:01 +02:00
Markolie 793b86b286 Config option for lobby music 2015-09-23 06:53:28 +02:00
Markolie d4a3537e75 Jukebox config example 2015-09-23 06:40:06 +02:00
Markolie b31e73c71b Tabs 2015-09-23 06:34:19 +02:00
Markolie ba7bd4cef1 sanitizeSQL 2015-09-23 06:31:35 +02:00
Markolie 7ab75a3b9a Missed prefix 2015-09-23 06:25:52 +02:00
Markolie bbaa60c8ce Fixes 2015-09-23 06:22:00 +02:00
Markolie bec9fca533 SQL update 2015-09-23 06:13:42 +02:00
Markolie d10b68363f IPC posibrain name fix 2015-09-23 05:15:26 +02:00
Markolie 2b7fda8a47 SQL based memos 2015-09-23 05:08:28 +02:00
Markolie 9d49985e1c Offer control to ghosts option 2015-09-23 04:44:12 +02:00
Mark van Alphen a9320fa701 Merge pull request #2140 from tigercat2000/whops
Fix COMIC-stuttering conflict
2015-09-23 04:43:29 +02:00
Tigercat2000 21e4750ade Fix COMIC-stuttering conflict 2015-09-22 19:37:57 -07:00
Markolie 4b2dcf2394 Nuke the privacy poll 2015-09-23 04:31:28 +02:00
Fox-McCloud dea1d5a78d Merge pull request #2136 from Markolie/pet
Fixes
2015-09-22 21:19:11 -04:00
Markolie bf2cabeca3 Tab 2015-09-23 03:08:38 +02:00
Markolie 039a79ff26 Research consoles auto sync fix 2015-09-23 02:52:07 +02:00
Markolie 551d4e8988 Admin jump window fix 2015-09-23 02:51:59 +02:00
Markolie ecb597594e Death ripley fix 2015-09-23 02:51:52 +02:00
Markolie b770e8f2a0 Implant fixes/updates 2015-09-23 02:51:33 +02:00
Markolie e020a8716b Holodeck rack exploit fix 2015-09-23 02:50:54 +02:00
Fox-McCloud 8a75113335 Merge pull request #2134 from Crazylemon64/monkeyrecyclerfix
Monkey Recycler Micro Manipulator Fix
2015-09-22 19:51:44 -04:00
TheDZD 67d84e0bbf Merge pull request #2118 from Markolie/pet
Fixes, saber SMG update
2015-09-22 19:06:37 -04:00
TheDZD cbbd31d445 Merge pull request #2128 from Fox-McCloud/rejuv-fixup
Rejuvinate Fixup
2015-09-22 19:05:51 -04:00
Crazylemon 2dab5fb9fe Made the monkey recycler consume the proper amount of monkeys, instead of 5 always. 2015-09-22 12:25:12 -07:00
Fox-McCloud d1ce77b30f cut the list 2015-09-22 12:17:11 -04:00
Mark van Alphen fea9ce1e78 Merge pull request #2116 from Fox-McCloud/borg-virus
Borg Transformation Virus Symptom
2015-09-22 16:52:18 +02:00
Mark van Alphen ca05c41134 Merge pull request #2117 from Fox-McCloud/surgery-cleanup
Cleans Up Surgery Files
2015-09-22 16:51:11 +02:00
Mark van Alphen 6d46c06297 Merge pull request #2113 from tigercat2000/whisper_autohiss
Whisper Refactor
2015-09-22 16:48:42 +02:00
Fox-McCloud 784dd66e46 Rejuvinate Fixup 2015-09-22 02:42:39 -04:00
Tigercat2000 a51fcb20c2 Fix posibrains being unable to speak binary 2015-09-21 22:19:27 -07:00
Markolie 58bf0b7d7e Adjustment to trinary nodes 2015-09-22 05:28:52 +02:00
Markolie df8209afe6 Atmos fixes 2015-09-22 05:15:05 +02:00
Markolie 91e1d7a516 Fix door crush bug 2015-09-22 04:07:09 +02:00
Fox-McCloud 562305902e fix for symptom 2015-09-21 21:10:20 -04:00
Markolie 727e1271b0 Missing variable 2015-09-22 01:51:28 +02:00
Markolie dc70ec8e8b Accounts database fix 2015-09-22 01:38:41 +02:00
Markolie 3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Tigercat2000 c43db838f2 fix me() verb 2015-09-21 15:15:05 -07:00
Mark van Alphen 78ad7adafa Merge pull request #2111 from Fox-McCloud/russian-revolver
Adds in Russian Revolvers
2015-09-21 23:01:58 +02:00
Markolie 3caac1e1e2 Check for 100+ armor 2015-09-21 22:58:42 +02:00
Markolie f7234374b5 Update armour penetration checks 2015-09-21 22:54:26 +02:00
Markolie ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Markolie cc641cb477 Photo image fix 2015-09-21 22:49:49 +02:00
Markolie adeac4f9da Logs fix 2015-09-21 22:22:33 +02:00
Markolie bcbabdf8a1 Fix aliens/animals attacking turrets 2015-09-21 22:21:16 +02:00