shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,375 Commits 5 Branches 0 Tags
aba636a44c4dd4c92242dfd65b4d5fb636d6ea29
Commit Graph

12726 Commits

Author SHA1 Message Date
Ghommie
aba636a44c ok 2020-02-17 00:13:16 +01:00
Ghommie
23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
Trilbyspaceclone
21e2a0892d Update meat.dm (#11028) 2020-02-16 07:46:45 +01:00
Trilbyspaceclone
a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
kevinz000
a5f06430e4 repulse armor sanity (#10949) 2020-02-16 07:36:50 +01:00
Seris02
c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857) 
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????

* fix

* no more getflaticon dabdabdabdabdabdabdab

* tada
 2020-02-16 07:31:30 +01:00
TrilbySpaceClone
cba6667332 it could work 2020-02-15 18:42:50 -05:00
kevinz000
36cebc733c Merge pull request #11039 from Ghommie/Ghommie-cit572 
Something about a couple runtimes.
 2020-02-15 12:19:50 -07:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
kevinz000
ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568 
Something about cryopods.
 2020-02-15 12:17:02 -07:00
kevinz000
f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563 
Holopad static fix and a few other mistakes.
 2020-02-15 12:16:23 -07:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
kevinz000
eb33901046 Merge pull request #11002 from BlackMajor/walkerbois 
Makes the Ash Walker camp a static spawn in lavaland.
 2020-02-15 11:47:58 -07:00
kevinz000
e250fb0a57 Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1 
Something about disposal bins and trash bags.
 2020-02-15 11:46:56 -07:00
kevinz000
6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 
Doubled halved flavor text max length and removed crappy code.
 2020-02-15 11:46:00 -07:00
kevinz000
29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 
Reduced tongue organ damage and tasting pH message spam.
 2020-02-15 11:45:50 -07:00
kevinz000
fa015c93bf Merge pull request #11047 from Trilbyspaceclone/patch-282 
Buffs oats and makes meatwheat have rarity
 2020-02-15 11:44:52 -07:00
Trilbyspaceclone
661e01ca0c Update miscellaneous.dm (#11094) 2020-02-15 19:12:19 +01:00
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283 
Blood Drunk Miner now uses a PKA
 2020-02-15 09:05:45 +01:00
Ghom
06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2 
Ring Improvements
 2020-02-15 09:04:54 +01:00
Ghom
ad639d5f2f Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7 
!tgs valentine
 2020-02-15 09:04:29 +01:00
Ghom
0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Ghom
33931da018 Merge pull request #11013 from r4d6/pickaxe 
Add two more pickaxes, Titanium & Plasteel
 2020-02-14 19:34:01 +01:00
Ghom
1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
Ghom
78ace8e855 Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6 
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
 2020-02-14 19:20:32 +01:00
Ghom
4512845fc3 Merge pull request #11062 from Citadel-Station-13/kevinz000-patch-10 
Changes to organ decay rate (tip it's not 15 minutes 0-100 damage and this was lying to you)
 2020-02-14 13:36:39 +01:00
kevinz000
4677bd47be Update vday.dm 2020-02-14 00:39:29 -07:00
Ghom
0b8dd2a03d Merge pull request #11045 from Trilbyspaceclone/patch-280 
Flat guns can no longer be suppressed
 2020-02-14 08:26:00 +01:00
Ghom
9e222e37c0 Merge pull request #11046 from Trilbyspaceclone/patch-281 
Changes the Stickmans projectile to be the correct caliber
 2020-02-14 08:25:46 +01:00
Ghom
2f417ef95a Merge pull request #11042 from Arturlang/pandemic_nerfs 
Nerfs the pandemics production.
 2020-02-14 08:04:16 +01:00
Ghom
64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00
Ghom
7be2602664 Merge pull request #11056 from necromanceranne/bloodgunsnotgood 
Bullets no longer do equal blood volume deletion to unmitigated damage; replicates #9682
 2020-02-14 07:54:41 +01:00
Ghom
e76fc296a4 Merge pull request #11081 from Detective-Google/prefbreakies-ooh-woo 
Makes the valentines chocolates no longer rule 9 bait
 2020-02-14 07:46:41 +01:00
kevinz000
94c6fae838 Update vday.dm 2020-02-13 21:27:44 -07:00
YakumoChen
2924be6a80 now with visible rings on hand(s) 2020-02-14 03:52:10 +00:00
kevinz000
b8d18758d1 Update vday.dm 2020-02-13 20:33:18 -07:00
YakumoChen
5c246fd389 diamond ring changes 
More code I stole from RP
 2020-02-14 03:00:31 +00:00
Detective Google
6c4c4b3f81 removes the crocin from the valentines candy 2020-02-13 19:59:38 -06:00
Linzolle
790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle
d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghom
8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink 
TGUI Next Uplinks
 2020-02-13 16:50:10 +01:00
Ghom
28a6384427 Merge pull request #10913 from Feasel/patch-3 
[Balance Pass - Dissection Early Game Buff]
 2020-02-13 16:49:01 +01:00
Ghom
91824571ff Merge pull request #11035 from Citadel-Station-13/kevinz000-patch-11 
fixes ctf claymores not spawning and buffs them to be armor pierce + less stamina
 2020-02-13 16:42:10 +01:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20 
Sprites, Tweaks, and Snacks, QoL
 2020-02-13 16:40:12 +01:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler 
ports auto profiler subsystem from tg
 2020-02-13 15:06:27 +01:00
Ghommie
23f7879057 taste spam 2020-02-13 14:57:08 +01:00
Artur
be30ca1642 Tweaks the blood type and volume, plus hopefully fixes the lag exploit. 2020-02-13 15:48:37 +02:00