shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,423 Commits 5 Branches 0 Tags
b95184ce65ce69dff192d56dd0226fc7a9eff5ea
Commit Graph
10362 Commits
Author SHA1 Message Date
BlackMajor 1a722a7b52 Update golems.dm 2019-10-22 11:28:07 +13:00
BlackMajorandGitHub a2bb6bb07a Merge pull request #9417 from Citadel-Station-13/kevinz000-patch-91 
REVS!!
 2019-10-22 11:01:20 +13:00
BlackMajorandGitHub 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
kevinz000andGitHub 69a125d996 Update neurotoxin.dm 2019-10-21 14:41:40 -07:00
TrilbyspacecloneandGitHub 70c7894155 Update emergency.dm 2019-10-21 17:20:44 -04:00
TrilbyspacecloneandGitHub 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
kevinz000andGitHub 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
nik707andGitHub ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
nik707andGitHub 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-samaandGitHub 6fe65368f6 roboticists can have some love 2019-10-21 10:00:52 -04:00
kappa-samaandGitHub 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-samaandGitHub 211a3f2f93 bad humor 
what am i doing
 2019-10-21 09:29:42 -04:00
kappa-samaandGitHub 797d6b4795 copy paste spaghetti 
forgive me
 2019-10-21 09:23:33 -04:00
kappa-samaandGitHub 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-samaandGitHub b728050882 alien research disk 
e
 2019-10-21 09:15:11 -04:00
Putnam 296ce4fb78 suggested changes 2019-10-21 05:18:44 -07:00
Putnam 74ca1a9ccf concept: actually let admins do it 2019-10-21 04:56:06 -07:00
Putnam da7d4345b5 Added a toggle dynamic vote verb for admins. 2019-10-21 03:18:27 -07: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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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 c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
kevinz000andGitHub 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 6ae9349dfe Fixes temporary transformation sting triggering heart attacks on heartless humans. 2019-10-20 15:27:19 +02:00
Ghommie 7e9298d5ac Fixing radio emotes conflict with drunk memes. 2019-10-20 12:21:21 +02: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
Ghommie 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
Ghommie 8cd93f2085 bad. 2019-10-20 07:28:04 +02:00
TrilbyspacecloneandGitHub 656ff4d943 Lowers exotic carpet to 7k from 10k 2019-10-20 00:18:11 -04:00
YakumoChenandGitHub e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChenandGitHub 6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChenandGitHub 61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChenandGitHub 37f58798ab no crafting 2019-10-20 03:05:21 +00:00
kevinz000andGitHub 8a8e36ba1c Update uplink_items.dm 2019-10-19 20:01:21 -07:00
kevinz000andGitHub 659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds 
Tend Wounds + Make Revival more accessible
 2019-10-19 19:52:21 -07:00
r4d6andGitHub 49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
deathride58 f72d058eb5 makes borg flashes actually take eye protection into account 2019-10-19 17:57:05 -04:00
Linzolle eb1e064c49 oh yeah surgeon 2019-10-19 10:48:30 -05:00
Ghommie fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02: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
Ghommie a57911b88a null lists type mismatch 2019-10-18 11:19:24 +02:00