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
|
3b5600b81d
|
Merge pull request #9092 from Sishen1542/emp-beacons
crew combat mechs are now spawned in with a tracking beacon
|
2019-08-11 10:00:36 -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 |
|
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 |
|
Sishen
|
23d4b9827d
|
fix, yadda yadda
|
2019-08-11 01:19:37 -04: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
|
234d058cc2
|
Update mecha_control_console.dm
|
2019-08-10 07:28:35 -04:00 |
|
Sishen
|
b0a28d1a29
|
Update mutations.dm
|
2019-08-10 02:16:07 -04:00 |
|
kevinz000
|
40b89f49cc
|
Merge pull request #9078 from kappa-sama/moth1
Changes teleporter machines to apply flyperson (more) equally
|
2019-08-09 22:22:29 -07: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 |
|
kevinz000
|
0329a80086
|
Merge pull request #9081 from BurgerLUA/Meteor-Fair-Warning
Central Command informs you when a Meteor Storm is about to hit 5 to 10 minutes before it happens
|
2019-08-09 11:20:16 -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
|
b8907c2f97
|
fixing what i forgot to do
|
2019-08-09 13:47:36 -04:00 |
|
Fermi
|
02b5100be7
|
Made scans advanced.
|
2019-08-09 13:01:14 +01:00 |
|
Fermi
|
6e0303fdba
|
Actual fix for #9091
|
2019-08-09 12:48:26 +01:00 |
|
Fermi
|
eb9e6a041d
|
Ghommie's fix.
|
2019-08-09 12:17:54 +01:00 |
|
Fermi
|
34cfd2c1e3
|
Fix for #9091
|
2019-08-09 12:12:25 +01:00 |
|
Ghommie
|
ee57720ee3
|
underwear colors fix 2: The revenge of the crunch.
|
2019-08-09 05:11:12 +02:00 |
|
Ghommie
|
eb3ae1d61a
|
Fixes clock cult mass recall.
|
2019-08-09 04:05:06 +02:00 |
|
kappa-sama
|
a8e4ce1f77
|
Merge branch 'master' into moth1
|
2019-08-08 18:27:34 -04:00 |
|
Ghommie
|
a7287ed4d1
|
Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185
|
2019-08-08 23:11:58 +02:00 |
|
TrilbySpaceClone
|
ab13b62bdd
|
fruits of labor
|
2019-08-08 16:14:04 -04:00 |
|
Ghommie
|
a9eeb28fff
|
Uncalibrated teleporters can now turn furries, scalies & co into flypeople too.
|
2019-08-08 21:09:11 +02:00 |
|
kappa-sama
|
2dc15b3fc0
|
Update teleporter.dm
|
2019-08-08 15:05:48 -04:00 |
|
Fermi
|
1fb07e286a
|
Removing reviewer comments incase of fullmerge.
|
2019-08-08 19:53:07 +01:00 |
|
kevinz000
|
ce064522fe
|
Merge pull request #9076 from BurgerLUA/Proper-Fix
Fixes end of round voting unintentionally showing map votes and not gamemode votes
|
2019-08-08 11:25:02 -07:00 |
|
BurgerLua
|
9566caa527
|
Added
|
2019-08-08 09:25:04 -07:00 |
|
Fermi
|
004b79d4cd
|
Vodka is alkaline
|
2019-08-08 15:31:07 +01:00 |
|
kevinz000
|
290dfb8bbd
|
Merge pull request #9071 from YakumoChen/cloningnerf
Nerfs Autocloning
|
2019-08-08 02:00:37 -07:00 |
|
kevinz000
|
ad7189a211
|
Merge pull request #9061 from deathride58/fuckfemurbreakers
Makes the femur breaker use the proper scream emote and makes the femur breaker guarantee the victim falls into crit
|
2019-08-08 01:59:51 -07:00 |
|
kevinz000
|
8b20413676
|
Merge pull request #9069 from Ghommie/Ghommie-cit183
Fixes cults teleportations.
|
2019-08-08 01:58:48 -07:00 |
|
Sishen
|
1f05123816
|
ook ook
|
2019-08-08 03:04:51 -04:00 |
|
kappa-sama
|
73e31aba04
|
Revert "Update teleporter.dm"
This reverts commit 5fcb94d8d6.
|
2019-08-08 02:55:27 -04:00 |
|
kappa-sama
|
42c37d9de3
|
Revert "Update teleporter.dm"
This reverts commit 2b3e53d7d6.
|
2019-08-08 02:55:24 -04:00 |
|
kappa-sama
|
85dc61f84d
|
Revert "Update teleporter.dm"
This reverts commit c963f5e43e.
|
2019-08-08 02:55:14 -04:00 |
|
kappa-sama
|
c963f5e43e
|
Update teleporter.dm
|
2019-08-08 02:40:51 -04:00 |
|
kappa-sama
|
2b3e53d7d6
|
Update teleporter.dm
|
2019-08-08 02:23:59 -04:00 |
|
kappa-sama
|
5fcb94d8d6
|
Update teleporter.dm
|
2019-08-08 02:12:31 -04:00 |
|
kappa-sama
|
f38ac0dfbf
|
possibly makes teleporter hate all races equally
let's go
|
2019-08-08 01:49:06 -04:00 |
|
BurgerLua
|
810251a37c
|
Fixed bug with voting
|
2019-08-07 20:47:36 -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 |
|
Fermi
|
99e95dcedf
|
Guess who forgot message admins
|
2019-08-07 18:57:38 +01:00 |
|
Ghommie
|
00bca0dd39
|
raise priority.
|
2019-08-07 19:20:14 +02:00 |
|
Fermi
|
10b2cec485
|
Adds a analyse function for advanced chems
|
2019-08-07 16:52:58 +01:00 |
|
Fermi
|
7391581a26
|
2 small fixes.
|
2019-08-07 11:33:53 +01:00 |
|
Fermi
|
2a049e3485
|
Should fix the locker conflict! (untested)
|
2019-08-07 09:40:13 +01:00 |
|