 Linzolle
|
2095a14256
|
add mining shuttle console to techweb
|
2019-08-12 13:49:26 -05:00 |
|
|
kevinz000
|
411e0cc2cc
|
Update on_move.dm
|
2019-08-12 00:17:31 -07:00 |
|
|
Fermi
|
0f4469e59f
|
Re-enables fermiexplosions in grenades.
|
2019-08-12 01:03:35 +01:00 |
|
|
Fermi
|
51a6ae96a0
|
R.data
|
2019-08-12 00:37:57 +01:00 |
|
|
Fermi
|
c0bbb099f8
|
Fixes disappearing chems.
|
2019-08-12 00:36:45 +01:00 |
|
|
Trilbyspaceclone
|
32d70bbb6a
|
>_<
|
2019-08-11 19:10:34 -04:00 |
|
|
Trilbyspaceclone
|
d30df526f7
|
Update berries.dm
|
2019-08-11 19:05:36 -04:00 |
|
|
Fermi
|
e30f72067e
|
Merge branch 'master' into NeuroFix
|
2019-08-12 00:00:28 +01:00 |
|
|
Sishen
|
ffa574b1be
|
Update machine_vending.dm
|
2019-08-11 13:17:55 -04:00 |
|
|
kevinz000
|
a971390cff
|
Merge pull request #8992 from jakeramsay007/Helmet-Internals
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
|
2019-08-11 10:15:49 -07: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
|
b75c82b4ee
|
Merge pull request #9054 from Sishen1542/stando
stands now remove trait_nodeath from their user if given by memento mori
|
2019-08-11 10:11:11 -07:00 |
|
|
Sishen
|
f1bc6e42c8
|
Update machine_vending.dm
|
2019-08-11 13:10:14 -04:00 |
|
|
kevinz000
|
96842ed1c3
|
Merge pull request #9075 from Ghommie/Ghommie-cit184
Removes a redunant Remove() from high luminosity eyes.
|
2019-08-11 10:05:58 -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
|
a576e71a01
|
Merge pull request #9101 from Sishen1542/stealthy-surgery
obfuscates specific surgeries, gives generalized areas to anybody in viewing range
|
2019-08-11 09:59:29 -07:00 |
|
|
TrilbySpaceClone
|
821463f59c
|
Nya
|
2019-08-11 11:47:56 -04: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 |
|
|
deathride58
|
5dddb11773
|
Fixes handcuffs being impossible to actually resist out of
|
2019-08-11 08:37:00 -04:00 |
|
|
Sishen
|
23d4b9827d
|
fix, yadda yadda
|
2019-08-11 01:19:37 -04:00 |
|
|
Poojawa
|
dcd682bd59
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-10 23:48:47 -05:00 |
|
|
Poojawa
|
2b2bdb37ba
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 23:26:20 -05: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 |
|
|
Cebutris
|
df136ab96c
|
lactation is now a preference
|
2019-08-10 23:28:16 -04:00 |
|
|
lolman360
|
da61b66f5c
|
ban me?
|
2019-08-11 11:11:30 +10:00 |
|
|
lolman360
|
92c7ae8732
|
yea i use webgit what ya gonna do
|
2019-08-11 11:07:17 +10:00 |
|
|
Poojawa
|
a3cd143131
|
whaccky github hijinks
|
2019-08-10 19:28:47 -05:00 |
|
|
Poojawa
|
57835e2f81
|
head announce datums
|
2019-08-10 19:20:05 -05:00 |
|
|
Poojawa
|
d496e16dde
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 19:14:41 -05:00 |
|
|
Fermi
|
251ac24e02
|
[NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction.
|
2019-08-11 00:35:36 +01:00 |
|
|
Cebutris
|
d77360c794
|
gives tea aspera proper reagents
|
2019-08-10 19:32:12 -04:00 |
|
|
Sishen
|
51011ccf97
|
Update guardian.dm
|
2019-08-10 07:05:53 -04:00 |
|
|
Sishen
|
15dbb7ff32
|
Update guardian.dm
|
2019-08-10 07:03:45 -04:00 |
|
|
Sishen
|
b0a28d1a29
|
Update mutations.dm
|
2019-08-10 02:16:07 -04:00 |
|
|
kevinz000
|
b3b22029a6
|
Merge pull request #9064 from cebutris/hugloves
Hugs of the North Star
|
2019-08-09 22:20:18 -07:00 |
|
|
kevinz000
|
74008beb8f
|
Merge pull request #9066 from Ghommie/Ghommie-cit181
Two lines fixes for invisible zipties and borked legcuffs.
|
2019-08-09 22:17:31 -07:00 |
|
|
kevinz000
|
f516fcf539
|
Merge pull request #9083 from Trilbyspaceclone/fruit
Strawbarries, and more
|
2019-08-09 22:16:34 -07:00 |
|
|
kevinz000
|
b213b0ed2b
|
Merge pull request #9084 from Ghommie/Ghommie-cit185
Fixes clock cult mass recall.
|
2019-08-09 22:16:09 -07:00 |
|
|
kevinz000
|
14033d9876
|
Merge pull request #9085 from Ghommie/Ghommie-cit186
underwear colors fix 2: The revenge of the crunch.
|
2019-08-09 22:15:55 -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 |
|
|
Sishen
|
dc66446064
|
dab dab
|
2019-08-09 03:19:02 -04:00 |
|
|
Sishen
|
4ba3d851ed
|
IT JUST WORKS
|
2019-08-09 00:46:14 -04:00 |
|
|
Ghommie
|
ee57720ee3
|
underwear colors fix 2: The revenge of the crunch.
|
2019-08-09 05:11:12 +02:00 |
|
|
Poojawa
|
f76bb27127
|
Fixes some runtimes and removes a holodeck exploit
and a cleanup >.>;
|
2019-08-08 21:33:42 -05:00 |
|
|
Ghommie
|
eb3ae1d61a
|
Fixes clock cult mass recall.
|
2019-08-09 04:05:06 +02:00 |
|
|
Sishen
|
1fc69a13a4
|
okay fixed
|
2019-08-08 22:02:12 -04: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 |
|
|
Poojawa
|
98a279a6db
|
likely fixes the examine bug lol
|
2019-08-08 17:45:01 -05:00 |
|
|
Poojawa
|
283b5d050e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-08 16:51:53 -05:00 |
|