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

15738 Commits

Author SHA1 Message Date
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
7b257242c2 bullets won't work... 2019-10-24 10:44:57 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
deathride58
724e4305e1 Fixes examinetext of mobs not actually showing when items are bloodstained by making get_examine_name() properly take blood-stained status into account 2019-10-23 21:08:59 -04:00
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
Ghommie
687d452d67 #44222, yea sorry for your rework Poojawa. 2019-10-23 16:15:26 +02:00
Ghommie
6c34a51ff4 protip: don't return datum references anymore. 2019-10-23 15:47:10 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
ba307b01a5 Defib fixes and chem effects stuff 2019-10-23 13:45:57 +02: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
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02: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
afc034d219 Merge pull request #9560 from BlackMajor/Yeet 
Updates every arrival and escape shuttle with various changes.
 2019-10-22 16:50:09 -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
fc56fd9f8b Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103 
Fixes and nerfs VTEC upgrades
 2019-10-22 16:48:10 -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
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
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
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
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
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
BlackMajor
959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Ghommie
015789ac45 fixes invisible men. 2019-10-21 10:08:48 +02:00