Commit Graph

415 Commits

Author SHA1 Message Date
Fermi fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Trilbyspaceclone ca2b4a8267 Update mutations.dm 2019-07-28 08:11:06 -04:00
Thalpy 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000 ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -07:00
kevinz000 3176cf958f Merge pull request #8917 from deathride58/fuckwarpwhistles
Fixes warp whistles
2019-07-20 11:54:48 -07:00
BurgerLUA 03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT 2019-07-17 14:17:33 -07:00
deathride58 ea5837bfb1 double the sanity check, double the stability 2019-07-17 16:54:02 -04:00
deathride58 42aae8f45f fixing warp whistles in literally two fucking lines 2019-07-17 16:49:46 -04:00
Ghommie 9384af188e Gives cult conversions an alert popup and a couple extra seconds. 2019-07-17 17:50:54 +02:00
Thalpy 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
kevinz000 628244c0ba Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
kevinz000 2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
Thalpy f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
kevinz000 b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
kevinz000 44474ddbd0 Merge pull request #8873 from Ghommie/Ghommie-cit131
Ports "Fixes clockwork armor armor"
2019-07-14 03:38:04 -07:00
Thalpy 4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000 280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
Ghommie ed9213066c Speedports "Fixes clockwork armor armor" 2019-07-12 06:09:16 +02:00
Ghommie 26ab7cc522 Ports "Show codewords on round end screen" 2019-07-11 08:40:11 +02:00
TrilbySpaceClone 54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Ghommie ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Thalpy c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
kevinz000 91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
kevinz000 9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111
Ports "Adds safer helper for alt-click turf listing"
2019-07-07 02:32:56 -07:00
Thalpy cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
Ghommie fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
BurgerLua f4307f919b Nerfed changeling transformation string by making it temporary. 2019-07-05 16:49:02 -07:00
kevinz000 748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
Ghommie 5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Thalpy 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Trilbyspaceclone 227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
TrilbySpaceClone 9cab7b960c web-editless 2019-06-26 18:10:13 -04:00
Fermi 10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
kevinz000 f7dcedce5f Merge pull request #8715 from Sishen1542/toxinmanbad
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
2019-06-23 06:57:09 -07:00
kevinz000 05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
2019-06-23 06:56:17 -07:00
kevinz000 294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
2019-06-23 06:50:32 -07:00
Ghommie d1008122da indention bested me. 2019-06-23 06:33:27 +02:00
Ghommie 41c0586154 Ports in "makes the abductor console use radials" 2019-06-23 06:28:37 +02:00
Sishen 0a43036eae hugboxing slimepeople one thing at a time 2019-06-21 20:01:19 -04:00
Ghommie 55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Thalpy 41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
deathride58 7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
2019-06-16 22:51:03 -04:00
kevinz000 27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
Ghommie b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Ghommie cf56870b57 Fixes the sacrificial target icon not displaying on the cult objective alert. 2019-06-13 23:48:15 +02:00
Arturlang 4d532ee67e Fixeds 2019-06-12 23:34:49 +03:00
Arturlang d83cf7e2eb Bug fix 2019-06-12 20:22:55 +03:00