shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

2467 Commits

Author SHA1 Message Date
Trilbyspaceclone
5eba0d55f9 Update trash.dm 2019-09-03 11:09:03 -04:00
Trilbyspaceclone
3f957ea488 grammer 2019-09-03 10:43:29 -04:00
Trilbyspaceclone
5168f2b233 Update granters.dm 2019-09-03 07:37:37 -04: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
67f4276aab Merge pull request #9104 from Sishen1542/tbaton 
classic & telebaton no longer have attack delay
 2019-09-02 18:35:56 -05:00
Sishen
0b6eb6e34c Update holy_weapons.dm 2019-09-01 22:36:39 -04:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -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
Poojawa
b2252a1c74 Medical assistance treats bleed_rate to stop phantom bleeding 2019-08-30 02:46:57 -05:00
Poojawa
dca90db321 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-29 23:03:26 -05:00
nik707
bff828d3be Merge pull request #9202 from Trilbyspaceclone/patch-216 
Ports "Fixes wallets #510" From KeplerStation
 2019-08-29 19:33:08 -05:00
nik707
fccafd6bd9 Merge pull request #9204 from Trilbyspaceclone/patch-217 
Fixes katana's being cursed when not cursed
 2019-08-29 19:31:40 -05:00
TrilbySpaceClone
d3852ebd56 even more 2019-08-29 19:39:10 -04:00
Dap
19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06: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
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
Trilbyspaceclone
6cf4783486 fixed 2019-08-27 13:56:47 -04:00
TrilbySpaceClone
419ea7f58c Fancy_part1 2019-08-27 12:41:47 -04:00
Trilbyspaceclone
77863119f2 Update wallets.dm 2019-08-27 11:31:52 -04:00
kevinz000
78c1ad972f Merge pull request #9179 from chefferz/master 
Gives His Grace stamina regeneration
 2019-08-26 19:39:46 -07:00
TrilbySpaceClone
00c01709b2 moves banners into crafting 2019-08-26 15:46:41 -04:00
Poojawa
bd49187ea7 on second thought, let's not try to half ass fancy ideas. 2019-08-26 14:45:36 -05:00
Poojawa
9558252b93 Revert/replaces a lot of #8024 with bleed_rate 
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood.  Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
 2019-08-26 14:22:17 -05:00
Poojawa
bdae9e051b Fixes some errant issues with overlays 2019-08-26 14:15:55 -05:00
TrilbySpaceClone
44893b6ee7 It just works 2019-08-26 06:32:54 -04:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
kappa-sama
036115eddb wallets can hold keys 2019-08-25 15:45:47 -04:00
TrilbySpaceClone
db317b65af Grand! 2019-08-24 19:39:15 -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
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
chefferz
3fcf9b329f Update his_grace.dm 2019-08-23 21:46:04 -04:00
Sishen
3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
chefferz
788d616c76 Update his_grace.dm 2019-08-23 03:47:21 -04:00
chefferz
de4d4a990b Updated weight class 
Updated weight class per Bhjin's suggestion
 2019-08-22 21:07:31 -04:00
chefferz
dca81de36c Gives His Grace stamina regeneration 
His Grace, the 20TC item, is meant to absorb stun damage. When it feeds on corpses, its hunger increases quickly and steadily, but the current stamina system makes it impossible to actually fight without stamcritting yourself and getting eaten.

This gives regeneration to where you can actually use His Grace in the later stages without suffering from exhaustion.
 2019-08-22 20:09:52 -04:00
kevinz000
ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212 
gives drones a RPD
 2019-08-21 08:15:08 -07:00
Poojawa
b29607c019 It's working again, I guess. wtf 2019-08-21 01:36:59 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
Sishen
7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
Trilbyspaceclone
d1404a84d8 Update backpack.dm 2019-08-19 07:03:54 -04:00
kevinz000
3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188 
Reblances bone satchles
 2019-08-18 23:39:39 -07:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa
088bc484e3 Forensics re-destroyed, but better this time. 
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
 2019-08-17 02:43:59 -05:00
Trilbyspaceclone
906e7a1bd8 Update backpack.dm 2019-08-17 00:25:40 -04:00