nik707
|
107bb36253
|
Merge pull request #9566 from Citadel-Station-13/kevinz000-patch-104
Fixes neurotoxin stunning non-carbons
|
2019-10-22 16:47:53 -05:00 |
|
kappa-sama
|
d204818ddc
|
disk not desk
sleepcoding is a bad idea
|
2019-10-22 14:45:26 -04:00 |
|
kevinz000
|
b9c96715b4
|
Merge pull request #9551 from Ghommie/Ghommie-cit254
Fixes recycler deleting all clothing for mobs found inside items (e.g bluespace bodybags)
|
2019-10-22 02:28:56 -07:00 |
|
kevinz000
|
3b0d8cf78b
|
Merge pull request #9556 from Linzolle/paper-fix
Fix not being able to read paper stuck to airlocks, lets AI view paper but with obfuscated text
|
2019-10-22 02:27:09 -07:00 |
|
kevinz000
|
684658b34f
|
Merge pull request #9559 from Ghommie/Ghommie-cit255
fixes invisible men.
|
2019-10-22 02:26:34 -07:00 |
|
kevinz000
|
2426849d4b
|
this is a pretty bad idea
|
2019-10-22 02:19:33 -07:00 |
|
kevinz000
|
02b549a9f7
|
Merge remote-tracking branch 'origin/master' into kevinz000-patch-70
|
2019-10-22 02:08:50 -07:00 |
|
Ghommie
|
b2035c5d6e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235
|
2019-10-22 09:18:30 +02:00 |
|
Ghommie
|
ee0c436651
|
legs
|
2019-10-22 09:17:37 +02:00 |
|
Poojawa
|
d6e28180a1
|
if this doesn't work, I won't be fixing it
|
2019-10-22 00:34:25 -05:00 |
|
Poojawa
|
7e27c46c78
|
Fuck components
|
2019-10-22 00:33:58 -05:00 |
|
Poojawa
|
5773c82c91
|
Adds the blood types as actual blood reagents too
|
2019-10-22 00:33:41 -05:00 |
|
deathride58
|
a7de466a01
|
Merge pull request #9534 from Linzolle/abductor-science-man
URGENT fixes for abductors
|
2019-10-21 22:30:07 -04:00 |
|
Poojawa
|
7463bbc001
|
Merge branch 'master' into syntheticbloods
|
2019-10-21 21:06:18 -05:00 |
|
deathride58
|
30eafc305c
|
Merge pull request #9246 from Linzolle/taur
[READY] some missing icons + sprite changes for taur suits
|
2019-10-21 21:19:05 -04:00 |
|
deathride58
|
ee0357b2c4
|
Merge pull request #9214 from Sishen1542/mechshit
properly ports neovgre from hippie
|
2019-10-21 21:17:57 -04:00 |
|
deathride58
|
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 |
|
deathride58
|
2742c86723
|
Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
|
2019-10-21 21:15:01 -04:00 |
|
Trilbyspaceclone
|
14000502b4
|
Update recipes_weapon_and_ammo.dm
|
2019-10-21 21:07:27 -04:00 |
|
Trilbyspaceclone
|
b4b875bf26
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-21 21:06:21 -04:00 |
|
kevinz000
|
07670b6644
|
Update robot_modules.dm
|
2019-10-21 17:57:30 -07:00 |
|
BlackMajor
|
cebdc1414f
|
Merge pull request #9540 from YakumoChen/laser-minigone
Reverts #9189 (Laser Minigun)
|
2019-10-22 13:36:45 +13:00 |
|
kappa-sama
|
2f30735fcb
|
yes
travis die
|
2019-10-21 20:36:17 -04:00 |
|
Poojawa
|
6fc750dca0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-21 19:13:19 -05:00 |
|
Trilbyspaceclone
|
2c72b91fbd
|
Triv curb kick
|
2019-10-21 19:16:13 -04:00 |
|
Trilbyspaceclone
|
5fced4427b
|
buffs paperwork
|
2019-10-21 19:05:53 -04:00 |
|
Trilbyspaceclone
|
8ce8246182
|
lowers paperwork
|
2019-10-21 19:01:59 -04:00 |
|
Trilbyspaceclone
|
7adba39e82
|
Update misc.dm
|
2019-10-21 19:00:02 -04:00 |
|
Trilbyspaceclone
|
0b03b879b3
|
adds more crates
|
2019-10-21 18:51:39 -04:00 |
|
r4d6
|
cdd24550dd
|
Make Cells not a viable replacement for the Stock Part Cheese
|
2019-10-21 18:50:58 -04:00 |
|
BlackMajor
|
1a722a7b52
|
Update golems.dm
|
2019-10-22 11:28:07 +13:00 |
|
BlackMajor
|
b77a94bd7d
|
Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88
buffs c4 on mobs
|
2019-10-22 11:04:30 +13:00 |
|
BlackMajor
|
a2bb6bb07a
|
Merge pull request #9417 from Citadel-Station-13/kevinz000-patch-91
REVS!!
|
2019-10-22 11:01:20 +13:00 |
|
BlackMajor
|
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 |
|
kevinz000
|
69a125d996
|
Update neurotoxin.dm
|
2019-10-21 14:41:40 -07:00 |
|
kevinz000
|
c0d4d32dee
|
Update robot_upgrades.dm
|
2019-10-21 14:36:21 -07:00 |
|
Trilbyspaceclone
|
70c7894155
|
Update emergency.dm
|
2019-10-21 17:20:44 -04:00 |
|
Trilbyspaceclone
|
6379807370
|
Update armory.dm
|
2019-10-21 17:10:48 -04:00 |
|
kappa-sama
|
4767a91ad2
|
Update _techweb.dm
|
2019-10-21 17:04:47 -04:00 |
|
Linzolle
|
32e863ac80
|
slightly less band-aidy way to do it
|
2019-10-21 14:12:09 -05:00 |
|
kevinz000
|
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 |
|
nik707
|
ba90df997f
|
Merge branch 'master' into wingcolors
|
2019-10-21 10:25:46 -05:00 |
|
nik707
|
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 |
|
kappa-sama
|
6fe65368f6
|
roboticists can have some love
|
2019-10-21 10:00:52 -04:00 |
|
kappa-sama
|
d7c6950788
|
scientists can now buy alien tech disk
this isn't a bad idea i swear
|
2019-10-21 09:30:11 -04:00 |
|
kappa-sama
|
211a3f2f93
|
bad humor
what am i doing
|
2019-10-21 09:29:42 -04:00 |
|
kappa-sama
|
797d6b4795
|
copy paste spaghetti
forgive me
|
2019-10-21 09:23:33 -04:00 |
|
kappa-sama
|
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 |
|
kappa-sama
|
b728050882
|
alien research disk
e
|
2019-10-21 09:15:11 -04:00 |
|
Ghommie
|
760522cf6a
|
Fixing some ayy overlays and client images oddities.
|
2019-10-21 11:29:43 +02:00 |
|