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

9205 Commits

Author SHA1 Message Date
Sishen
3f954f10a7 Update runes.dm 2019-09-02 02:09:59 -04:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen
279a6ed83e bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths 2019-08-31 17:57:36 -04:00
Sishen
d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04:00
Sishen
ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
Sishen
b69c928419 FOR THE EMPEROR 2019-08-30 16:50:03 -04: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
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
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
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
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
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
deathride58
ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -04: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
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
BlackMajor
dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124 
Removes Nitryl bounty but adds 7 more in!
 2019-08-19 20:07:40 +12:00
kevinz000
1ab64d4003 Update ert.dm 2019-08-18 23:43:31 -07:00
kevinz000
86cb735cc9 Merge branch 'master' into kevinz000-patch-64 2019-08-18 23:41:40 -07:00
kevinz000
47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such 
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
 2019-08-18 23:37:56 -07:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz 
addition of the "assistant response team" a pack of assistants sent in from CComm
 2019-08-18 23:34:49 -07:00
kevinz000
558ea557f8 Merge pull request #9151 from Trilbyspaceclone/cloak 
Adds chameloen necktie item
 2019-08-18 23:34:03 -07:00
kevinz000
ec349ae347 Merge pull request #9134 from Arturlang/Nanite-sloime-heals 
Nanite Adv toxin healing now heals slimes
 2019-08-18 23:33:02 -07:00
kevinz000
f55682d6dd Merge pull request #9136 from Sishen1542/strained 
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
 2019-08-18 23:32:47 -07:00
kevinz000
86cfd8a561 Merge pull request #9141 from deathride58/removwarpwissle 
Actually fixes warp whistle runtimes
 2019-08-18 23:32:15 -07:00
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213 
Patch 213
 2019-08-19 11:12:50 +10:00
TrilbySpaceClone
e1cee15720 seed 2019-08-18 01:40:36 -04:00
TrilbySpaceClone
566a4e65a1 right crafting 2019-08-18 01:31:38 -04:00
Trilbyspaceclone
8214a7012f I Didnt save the two corrections 2019-08-18 01:17:34 -04:00
Trilbyspaceclone
fc6633071a rwar! 2019-08-18 01:07:38 -04:00
TrilbySpaceClone
4dae36869c tada 2019-08-18 01:01:00 -04:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12:00
Trilbyspaceclone
43b1d0405e Update flowers.dm 2019-08-17 23:25:38 -04:00
Trilbyspaceclone
bb9aa4f039 I woulder how much this will fuck everthing up 2019-08-17 22:49:06 -04:00
Trilbyspaceclone
cfd8217947 Update flowers.dm 2019-08-17 22:10:23 -04:00
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
Trilbyspaceclone
7ddfff7f5c Update uplink_items.dm 2019-08-16 23:07:15 -04:00
deathride58
20d71d1196 Fixes warp whistle runtimes for real this time. 2019-08-16 22:19:37 -04:00