ee0357b2c4
Merge pull request #9214 from Sishen1542/mechshit
...
properly ports neovgre from hippie
2019-10-21 21:17:57 -04:00
f7cf10853e
Merge pull request #8894 from Citadel-Station-13/tgfusion
...
T G F U S I O N
2019-10-21 21:17:16 -04:00
2742c86723
Merge pull request #9072 from Poojawa/gen-poppers
...
Genpop for security
2019-10-21 21:15:01 -04:00
14000502b4
Update recipes_weapon_and_ammo.dm
2019-10-21 21:07:27 -04:00
b4b875bf26
Merge branch 'master' into A_Tailer's_art
2019-10-21 21:06:21 -04:00
07670b6644
Update robot_modules.dm
2019-10-21 17:57:30 -07:00
cebdc1414f
Merge pull request #9540 from YakumoChen/laser-minigone
...
Reverts #9189 (Laser Minigun)
2019-10-22 13:36:45 +13:00
2f30735fcb
yes
...
travis die
2019-10-21 20:36:17 -04:00
6fc750dca0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-21 19:13:19 -05:00
2c72b91fbd
Triv curb kick
2019-10-21 19:16:13 -04:00
5fced4427b
buffs paperwork
2019-10-21 19:05:53 -04:00
8ce8246182
lowers paperwork
2019-10-21 19:01:59 -04:00
7adba39e82
Update misc.dm
2019-10-21 19:00:02 -04:00
0b03b879b3
adds more crates
2019-10-21 18:51:39 -04:00
cdd24550dd
Make Cells not a viable replacement for the Stock Part Cheese
2019-10-21 18:50:58 -04:00
1a722a7b52
Update golems.dm
2019-10-22 11:28:07 +13:00
a2bb6bb07a
Merge pull request #9417 from Citadel-Station-13/kevinz000-patch-91
...
REVS!!
2019-10-22 11:01:20 +13:00
c901f796f8
Merge pull request #8963 from Citadel-Station-13/kevinz000-patch-61
...
healing holoparasites now heals toxlovers
2019-10-22 10:50:04 +13:00
69a125d996
Update neurotoxin.dm
2019-10-21 14:41:40 -07:00
70c7894155
Update emergency.dm
2019-10-21 17:20:44 -04:00
6379807370
Update armory.dm
2019-10-21 17:10:48 -04:00
4767a91ad2
Update _techweb.dm
2019-10-21 17:04:47 -04:00
32e863ac80
slightly less band-aidy way to do it
2019-10-21 14:12:09 -05:00
cbf7509749
Merge pull request #9536 from r4d6/patch-2
...
Change the SEVA suit & Exo-suit's descriptions
2019-10-21 11:16:56 -07:00
ba90df997f
Merge branch 'master' into wingcolors
2019-10-21 10:25:46 -05:00
671fdf32c9
Merge pull request #9520 from r4d6/master
...
Allow Humans, Felinids, Slimepersons and Lizardpeoples to have Decorative Wings just like Mammals
2019-10-21 10:24:30 -05:00
6fe65368f6
roboticists can have some love
2019-10-21 10:00:52 -04:00
d7c6950788
scientists can now buy alien tech disk
...
this isn't a bad idea i swear
2019-10-21 09:30:11 -04:00
211a3f2f93
bad humor
...
what am i doing
2019-10-21 09:29:42 -04:00
797d6b4795
copy paste spaghetti
...
forgive me
2019-10-21 09:23:33 -04:00
3077d538ec
makes alien tech unlocking more consistent
...
and also makes them cost more and require more relevant research to get, as well as decreasing their export price
2019-10-21 09:21:48 -04:00
b728050882
alien research disk
...
e
2019-10-21 09:15:11 -04:00
760522cf6a
Fixing some ayy overlays and client images oddities.
2019-10-21 11:29:43 +02:00
015789ac45
fixes invisible men.
2019-10-21 10:08:48 +02:00
814f91ee8e
Merge pull request #9545 from Ghommie/Ghommie-cit248
...
Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears"
2019-10-21 01:07:00 -07:00
9e63413911
Merge pull request #9466 from deathride58/yawnborgs
...
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-21 01:04:34 -07:00
838575da50
Merge pull request #9503 from deathride58/tasernerf
...
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-21 00:59:58 -07:00
c6c2a703e5
Merge remote-tracking branch 'origin/master' into magrifles_again
2019-10-21 00:47:03 -07:00
3d24d18622
Update soulstone.dm
2019-10-20 21:27:34 -07:00
6ddd1181a8
paper code is weird rn
2019-10-20 16:53:47 -05:00
6ae9349dfe
Fixes temporary transformation sting triggering heart attacks on heartless humans.
2019-10-20 15:27:19 +02:00
7e9298d5ac
Fixing radio emotes conflict with drunk memes.
2019-10-20 12:21:21 +02:00
964372b047
Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears"
2019-10-20 09:34:16 +02:00
ca1e4b6e65
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235
2019-10-20 07:29:32 +02:00
8cd93f2085
bad.
2019-10-20 07:28:04 +02:00
656ff4d943
Lowers exotic carpet to 7k from 10k
2019-10-20 00:18:11 -04:00
e39a087dc8
remove beam
2019-10-20 03:09:32 +00:00
6a5d1c20bd
delete minigun
2019-10-20 03:08:20 +00:00
61bc735ee7
remove gatling laser
2019-10-20 03:07:23 +00:00
37f58798ab
no crafting
2019-10-20 03:05:21 +00:00
deathride58