Ghommie
274fdf8c06
return.
2019-09-24 01:40:48 +02:00
Ghommie
1fa40dac38
Changes.
2019-09-23 17:25:08 +02:00
XDTM
023428f6a4
port experimental dissection
2019-09-18 23:04:11 -05:00
Poojawa
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
Sishen
5159a58fef
Update strained_muscles.dm
2019-09-14 12:00:28 -04:00
Poojawa
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
kevinz000
c5f3f3d7f9
Merge pull request #9250 from MrJWhit/abductor-spawntext
...
Changes Abductor Spawntext
2019-09-07 11:26:38 -07:00
MrJWhit
97072c63c8
Adds text to not disturb the habatat to abductor spawntext
...
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
2019-09-07 13:52:08 -04:00
kevinz000
87cf0b971a
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2019-09-06 16:47:46 -07:00
Sishen
3f954f10a7
Update runes.dm
2019-09-02 02:09:59 -04:00
Ghommie
4085b479d1
Fixing clockie mass recall that I apparently didn't really fix before.
2019-09-01 01:45:33 +02:00
Sishen
279a6ed83e
bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths
2019-08-31 17:57:36 -04:00
nik707
9a0b6a21f9
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
...
Amber alert ERTs no longer get pulse weapons
2019-08-28 13:05:56 -05:00
Ghommie
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
kevinz000
1ab64d4003
Update ert.dm
2019-08-18 23:43:31 -07:00
kevinz000
86cb735cc9
Merge branch 'master' into kevinz000-patch-64
2019-08-18 23:41:40 -07:00
kevinz000
8a96b29ef9
Merge pull request #9137 from Sishen1542/the-d-boiz
...
addition of the "assistant response team" a pack of assistants sent in from CComm
2019-08-18 23:34:49 -07:00
kevinz000
f55682d6dd
Merge pull request #9136 from Sishen1542/strained
...
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
2019-08-18 23:32:47 -07:00
deathride58
20d71d1196
Fixes warp whistle runtimes for real this time.
2019-08-16 22:19:37 -04:00
Sishen
26de2b8111
greybois
2019-08-16 10:49:26 -04:00
Sishen
03ec103e3d
Update strained_muscles.dm
2019-08-16 10:02:52 -04:00
kevinz000
2cdfa9cf2f
Merge pull request #9126 from Sishen1542/viro-cures
...
Adds more variety in virus cures, more consistent difficulty scaling.
2019-08-15 01:12:12 -07:00
Sishen
382487fdc2
viruseseses-cures
2019-08-13 05:32:37 -04:00
kevinz000
d3b3836d33
Merge pull request #9010 from BurgerLUA/Actual-War-Ops
...
War Ops now informs the crew where the Nuclear Device is located when activated.
2019-08-11 10:13:02 -07:00
kevinz000
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
kevinz000
cba8d3478a
Merge pull request #9079 from Sishen1542/lingblade
...
gives ling armblade 20 armor pen to make it more in line with eswords
2019-08-11 10:01:10 -07:00
kevinz000
b2eda962d1
Merge pull request #9093 from MrJWhit/Change-IAA-Text
...
Adds a line in the spawntext for IAA
2019-08-11 08:34:21 -07:00
BlackMajor
5dcd419d8a
Merge pull request #8356 from Thalpy/master
...
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
Sishen
b0a28d1a29
Update mutations.dm
2019-08-10 02:16:07 -04:00
kevinz000
b213b0ed2b
Merge pull request #9084 from Ghommie/Ghommie-cit185
...
Fixes clock cult mass recall.
2019-08-09 22:16:09 -07:00
MrJWhit
77e0551616
Adds a line in the spawntext for IAA
...
Adds "By no means reveal that you, or any other NT employees, are undercover agents." at the spawntext
2019-08-09 13:56:07 -04:00
Ghommie
eb3ae1d61a
Fixes clock cult mass recall.
2019-08-09 04:05:06 +02:00
Ghommie
12c4fc139d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-08-09 04:00:23 +02:00
Sishen
1f05123816
ook ook
2019-08-08 03:04:51 -04:00
BurgerLUA
f33b9fa480
Merge branch 'master' into Actual-War-Ops
2019-08-07 19:50:47 -07: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
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01: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
1db0ceff1f
Added
2019-07-31 03:33:33 -07:00
BurgerLua
89f2ed4064
Added
2019-07-31 02:55:48 -07:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01: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
