shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,904 Commits 5 Branches 0 Tags
a62fcdcccb55e1b50e8faa7b22fef256b9e7d731
Commit Graph

10130 Commits

Author SHA1 Message Date
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
BlackMajor
2a6cbe4df2 Merge pull request #8938 from Citadel-Station-13/kevinz000-patch-55 
Adds pyro/cryo/advanced grenade casings to science, as well as test range firing pins, floralrays, and stunshells
 2019-10-24 13:48:29 +13:00
kevinz000
ab02626ef7 Merge pull request #9588 from ItzGabby/Gabby-bat_species_parts 
Anthromorph Bat Parts for character customization
 2019-10-23 17:00:08 -07:00
ItzGabby
25e426ddd0 Adds new parts for anthromorphs 
Adds bat ears, bat marking, bat tails (Two variants and animation included), and new alternative snouts. Also cleans up the wing selection menu to be alphabetic, because, it was horrific to look at.
 2019-10-23 07:26:01 -04:00
kevinz000
e226a79c9b Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2019-10-22 23:11:56 -07:00
nik707
10de9091ec Merge pull request #9558 from Citadel-Station-13/kevinz000-patch-102 
fixes soulstones leaving behind abstract invisibility bodies
 2019-10-22 16:50:22 -05:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
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
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
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
BlackMajor
cebdc1414f Merge pull request #9540 from YakumoChen/laser-minigone 
Reverts #9189 (Laser Minigun)
 2019-10-22 13:36:45 +13: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
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
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
Ghommie
760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
Ghommie
015789ac45 fixes invisible men. 2019-10-21 10:08:48 +02:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
3d24d18622 Update soulstone.dm 2019-10-20 21:27:34 -07:00
Linzolle
6ddd1181a8 paper code is weird rn 2019-10-20 16:53:47 -05:00
Ghommie
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
YakumoChen
e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChen
6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChen
61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChen
37f58798ab no crafting 2019-10-20 03:05:21 +00:00
kevinz000
659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds 
Tend Wounds + Make Revival more accessible
 2019-10-19 19:52:21 -07:00
r4d6
49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
Linzolle
eb1e064c49 oh yeah surgeon 2019-10-19 10:48:30 -05:00
Linzolle
39788c8216 fix abductors 2019-10-18 23:45:13 -05:00
Linzolle
c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Poojawa
c7e1449a3c re-adds blood crate 2019-10-18 06:02:23 -05:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
TrilbySpaceClone
1707d6e6d2 er? 2019-10-18 01:22:19 -04:00