Commit Graph

416 Commits

Author SHA1 Message Date
kevinz000
b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185
Fixes clock cult mass recall.
2019-08-09 22:16:09 -07:00
Ghommie
eb3ae1d61a Fixes clock cult mass recall. 2019-08-09 04:05:06 +02:00
Ghommie
9e41731ed1 Fixes cult runes teleporting you from the source turf to the source turf. 2019-08-07 21:35:15 +02:00
Ghommie
2f65700913 Fixes clock cult Abscond. 2019-08-07 06:12:14 +02:00
kevinz000
9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
kevinz000
489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
kevinz000
afe2dd1e28 Merge pull request #9009 from BurgerLUA/Proper-Calculations
Fixed WarOps Challenge incorrectly counting players
2019-08-04 19:14:08 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
kevinz000
84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting
Hallucination Sting Buffs
2019-08-01 23:26:37 -07:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
BurgerLua
89f2ed4064 Added 2019-07-31 02:55:48 -07:00
Ghommie
db3b714489 . 2019-07-29 04:52:53 +02:00
Ghommie
2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Trilbyspaceclone
ca2b4a8267 Update mutations.dm 2019-07-28 08:11:06 -04:00
kiwedespars
20bffa910a Add files via upload 2019-07-27 21:36:15 -07: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
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
75a8cbcc39 Makes Zelus flasks a subtype of bottle. 2019-07-16 15:39:30 +02: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
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
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
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
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
Trilbyspaceclone
227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
TrilbySpaceClone
9cab7b960c web-editless 2019-06-26 18:10:13 -04: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