shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,822 Commits 5 Branches 0 Tags
16a556b3676928725c58dbcd7af5e7112b63359b
Commit Graph

24209 Commits

Author SHA1 Message Date
silicons
16a556b367 Merge pull request #13101 from Detective-Google/funny 
spelling
 2020-08-11 01:43:35 -07:00
silicons
df05c5ee4d Merge pull request #13089 from Putnam3145/fix-sprite-display 
Demodularization + making certain sprite overlays less hilariously jank
 2020-08-11 01:43:21 -07:00
silicons
c1d8d1d439 Merge pull request #13090 from lolzalolka/lean 
Added Burek to Space
 2020-08-11 01:42:58 -07:00
silicons
5694923d89 Merge pull request #13095 from lolman360/liver 
custom name/desc ring and necklace
 2020-08-11 01:41:48 -07:00
silicons
035422ed7f Merge pull request #13098 from LetterN/ToS-component 
Mafia Component
 2020-08-11 01:41:13 -07:00
silicons
82824f9fb9 Merge pull request #13100 from lolzalolka/lean2 
Suture/Mesh Crafting (take2)
 2020-08-11 01:40:50 -07:00
Letter N
ab7c560f6d revert 2020-08-11 16:04:18 +08:00
silicons
5814eba033 Merge pull request #13103 from Hatterhat/oops-all-parries 
funny timestop katana is less funny and more gameplay oriented
 2020-08-10 23:30:30 -07:00
Letter N
7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
Letter N
afe53992b5 miniump of 5, max of 12 2020-08-10 17:47:33 +08:00
silicons
05290c85f3 Merge pull request #13094 from Hatterhat/tc-theft-patch 
PDA Uplinks Can Now Siphon Pens
 2020-08-10 02:30:11 -07:00
silicons
ef2c024fbe Merge pull request #13093 from kappa-sama/patch-41 
Tracer's a human, not a changeling.
 2020-08-10 02:29:58 -07:00
silicons
3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr 
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
 2020-08-10 02:29:47 -07:00
Letter N
c70f1510e6 fairly sure mmo mafia is not a thing and i'm lazy 2020-08-10 16:00:38 +08:00
Letter N
ec57c24a71 endgame 2020-08-10 13:10:40 +08:00
Letter N
a4040ace26 hewwo have you tried to work? 2020-08-10 10:50:07 +08:00
Hatterhat
ff49790ac9 radius/force/blockchance nerf 2020-08-09 21:27:57 -05:00
Detective Google
bbe32ab412 lmao 2020-08-09 16:36:58 -05:00
chrisbbbbbbb
758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
chrisbbbbbbb
fcb7ec8f2c Revert "suture crafting stuff" 
This reverts commit 885013a8b8.
 2020-08-09 20:17:59 +02:00
chrisbbbbbbb
e8ac70696f new food idk? 2020-08-09 18:58:32 +02:00
silicons
4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02:00
Winter Flare
76293ee032 My balls are raw. Meatballs, that is. (#13075) 
* Food Processor produces Raw Meatball

* No nutrition loss from slabs.
 2020-08-09 16:01:52 +02:00
silicons
07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933) 
* Update areas.dm

* Update apc.dm

* Update apc.dm
 2020-08-09 15:57:53 +02:00
silicons
5abab38613 increases space levels to 4 (#13022) 
* Update map_config.dm

* Update code/modules/mapping/map_config.dm

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2020-08-09 15:41:58 +02:00
Letter N
2f1b769ae4 lazyfix 2020-08-09 21:38:42 +08:00
Letter N
bfba7307ec fix 2020-08-09 21:29:08 +08:00
Seris02
635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00
Letter N
f86fb54aab https://github.com/tgstation/tgstation/tree/master/code/modules/mafia 2020-08-09 21:09:52 +08:00
silicons
a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +02:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
silicons
ed07497835 Merge pull request #13040 from Sishen1542/blockstool 
funny chair loses block chance and gains active block/parry
 2020-08-09 05:44:13 -07:00
silicons
8ef539b417 Merge pull request #13053 from kappa-sama/patch-39 
makes cargo's Dirty Magazines 3x cheaper
 2020-08-09 05:43:37 -07:00
silicons
fb43e9a2d2 Merge pull request #13054 from KeRSedChaplain/zombies! 
Improves zombies, the gimped threat
 2020-08-09 05:42:31 -07:00
silicons
25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana 
wizard timestop parrying katana
 2020-08-09 05:41:55 -07:00
silicons
cd18e3f4d3 Merge pull request #13085 from Hatterhat/glaive-parry-cont 
KC-G Phase 2.1 - Parry Tweaks
 2020-08-09 05:41:26 -07:00
silicons
d2f5c6688b Merge pull request #13084 from Putnam3145/ic-wording-fix 
Made IC issue wording less salt-assuming
 2020-08-09 05:41:10 -07:00
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro 
Removed (an)aphrodisiacs.
 2020-08-09 05:39:56 -07:00
silicons
d25daec117 Merge pull request #13081 from Putnam3145/ethereals 
Ports ethereals from TG
 2020-08-09 05:39:43 -07:00
Letter N
773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
silicons
ba6eefc945 Merge pull request #13078 from Putnam3145/fix-reroll 
Made traitor reroll reroll to MI13 only.
 2020-08-09 05:38:23 -07:00
silicons
bd65c8efc6 Merge pull request #13079 from Hatterhat/parry-text 
parry counterattack text now actually shows up
 2020-08-09 05:37:42 -07:00
silicons
d9764bf5ea Merge pull request #13066 from timothyteakettle/make-speech-verbs-dna-based 
speech verbs now copy through dna copying
 2020-08-09 05:37:08 -07:00
silicons
88cb61b08a Merge pull request #13068 from Hatterhat/med-stack-buff 
sterilized gauze, ointment and suture stacksizes
 2020-08-09 05:36:51 -07:00
silicons
3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port 
Ports TG #51879 - Makes rads glow, buffs rad goggles
 2020-08-09 05:35:08 -07:00
zerothebigboy
822c17e444 a 2020-08-09 08:07:40 -04:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
lolman360
c9de596fde Verified! 2020-08-09 15:31:49 +10:00
lolman360
50448549fb ee 2020-08-09 15:26:08 +10:00
Letter N
2615506ae9 oops, forgot about this 2020-08-09 13:18:10 +08:00