shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,417 Commits 5 Branches 0 Tags
dbdaae83b6f9c8262ac16fdb7c26e41cba4cacaa
Commit Graph

9239 Commits

Author SHA1 Message Date
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
nik707
44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass 
Adds support for trit, bz, and pluox to the SM
 2019-09-02 18:37:42 -05:00
nik707
2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears 
Plasmaglass Tables, Spears, Shards (Take 2)
 2019-09-02 18:37:22 -05:00
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox 
Adds the Male AI vox voice.
 2019-09-02 18:27:03 -05:00
nik707
e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219 
Ports "Fixes slimes not feeding #44760"
 2019-08-31 02:09:15 -05:00
nik707
c826e1b412 Merge pull request #9175 from lolman360/master 
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
 2019-08-31 02:06:33 -05:00
Trilbyspaceclone
9c9e1b1da3 Update life.dm 2019-08-30 09:24:58 -04:00
kevinz000
931527ff7c Update mob.dm 2019-08-29 22:54:41 -07:00
nik707
2307f7a2a6 Merge pull request #9146 from Raptorizer/Botany-Peaches 
New plant type: Peaches
 2019-08-29 19:59:37 -05:00
nik707
1132b75392 Merge pull request #9173 from Citadel-Station-13/kevinz000-patch-76 
Removes duplicate definition of games and toys nodes and readds autoylathe
 2019-08-29 19:53:37 -05:00
nik707
e7b267254b Merge pull request #9200 from Owai-Seek/minor-fixes 
Fixes Strawberries
 2019-08-29 19:34:09 -05:00
nik707
01f732c57a Merge pull request #9207 from Ghommie/Ghommie-cit189 
Rawket lawnchair fix.
 2019-08-29 19:29:14 -05:00
nik707
36a07f134b Merge pull request #9208 from Ghommie/Ghommie-cit190 
Socks uncolorability fix.
 2019-08-29 19:28:01 -05:00
nik707
121c2c2f53 Merge pull request #9172 from Citadel-Station-13/kevinz000-patch-75 
You rack the riot shotgun
 2019-08-29 19:11:19 -05:00
nik707
fd2aec7efe Merge pull request #9171 from Citadel-Station-13/kevinz000-patch-74 
Fixes and optimizes ghost swords
 2019-08-29 19:09:40 -05:00
nik707
4f9b901a97 Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73 
Rebalances the MASONrig
 2019-08-29 19:06:04 -05:00
nik707
bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping 
Donator grouping system
 2019-08-29 18:31:23 -05:00
nik707
2f7402f591 Merge pull request #9184 from Ghommie/Ghommie-cit188 
Removes an obnoxious temporary overlay var.
 2019-08-29 18:19:44 -05:00
Sishen
07a2d19c34 Update supermatter.dm 2019-08-28 23:58:27 -04:00
Dap
19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06:00
nik707
9a0b6a21f9 Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64 
Amber alert ERTs no longer get pulse weapons
 2019-08-28 13:05:56 -05:00
Sishen
c664032e85 Update supermatter.dm 2019-08-28 02:23:24 -04:00
nik707
8e40e9d887 Merge pull request #9186 from Sishen1542/walklikeanegyptian 
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
 2019-08-28 00:02:39 -05:00
kevinz000
bea4349056 Merge pull request #9180 from deathride58/buffspoly 
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
 2019-08-27 20:50:59 -07:00
Ghommie
0ffeb704af Socks color fix. 2019-08-28 05:33:36 +02:00
Ghommie
18b023b127 arg 2019-08-28 04:47:53 +02:00
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 
Fixes emags wasting charges on un-emaggable stuff.
 2019-08-28 13:54:03 +12:00
Ghommie
e25697dc14 rocket fix. 2019-08-28 03:37:35 +02:00
Winter Flare
26c5aa6185 Update berries.dm 
Actually fixes strawberries so they have visible growth stages and death icons.
 2019-08-27 03:47:56 -04:00
kevinz000
f07cdc0665 Merge pull request #9177 from JTGSZ/fix 
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
 2019-08-26 19:42:15 -07:00
kevinz000
96278b45ad Merge pull request #9183 from Ghommie/Ghommie-cit187 
Fixes "Blood Cult Conversion Prompt Issues"
 2019-08-26 19:36:06 -07:00
kevinz000
c069e76304 Merge pull request #9181 from Linzolle/general-swordsky 
[SPEEDMERGE] fixes sword exploit and secbot construction
 2019-08-26 19:35:51 -07:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
kevinz000
d64e5b29fd Update reactions.dm 2019-08-25 15:59:45 -07:00
Sishen
b093439c73 aaaaaaaa 2019-08-25 16:27:02 -04:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Sishen
3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
Ghommie
2ce01b3bda Removes an obnoxious temporary overlay var. 2019-08-23 19:57:57 +02:00
Ghommie
106cd7b845 Fixes "Blood Cult Conversion Prompt Issues" 2019-08-23 19:38:39 +02:00
Linzolle
62a51d8df5 infinite sword exploit 2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354 TABS 2019-08-23 01:08:53 -05:00
deathride58
9a32d437a5 grants poly the ability to speak through the TGS relay (with a 0.01% chance) 2019-08-22 20:33:12 -04:00
JTGSZ
e6dbaf8473 this should work 2019-08-22 13:02:01 -04:00
lolman360
c618ce114d Ebb 2019-08-22 14:18:49 +10:00
deathride58
ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -04:00
kevinz000
2f9ca28d38 this is bad performance and probably unnecessary but juuust in case.. 2019-08-21 08:17:34 -07:00
kevinz000
25a7d3af51 Merge pull request #8968 from Trilbyspaceclone/patch-199 
Fixes dead/used face huggers from still infecting
 2019-08-21 08:16:06 -07:00
kevinz000
7fe2d2b5f2 Merge pull request #9142 from Trilbyspaceclone/patch-211 
removes glue from nukies/clownops uplinks
 2019-08-21 08:11:44 -07:00
kevinz000
3f6256d945 Update all_nodes.dm 2019-08-21 08:06:08 -07:00
kevinz000
3c59b43ff7 Update shotgun.dm 2019-08-21 06:39:18 -07:00