shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,354 Commits 5 Branches 0 Tags
f0bcab1143dbd649be07cb4e1ad659ebccced0d4
Commit Graph

24553 Commits

Author SHA1 Message Date
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
lolman360 cbe783023d Update autohydro.dm 2020-08-09 23:55:06 +10:00
lolman360 6c57dce54e WX 2020-08-09 23:52:21 +10: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
lolman360 fee304fb19 Update medical_designs.dm 2020-08-09 22:55:10 +10:00
silicons a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +02:00
lolman360 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10: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
Michiyamenotehifunana 9b6156ad81 Ports opposums 
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
 2020-08-09 16:35:12 +08: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
Hatterhat 197e426432 heho funny uplink thefties 2020-08-08 23:54:31 -05:00
Letter N 4bed3a5349 OH FUCK 2020-08-09 12:49:14 +08:00
Putnam bdee7bdc63 linters are always your friend 2020-08-08 21:38:53 -07:00
Letter N 5abcc1c220 reverts this change 2020-08-09 12:00:12 +08:00
kappa-sama 8c61dd875b poggers 2020-08-08 21:30:42 -04:00
silicons 0decd32e54 Update living_active_block.dm 2020-08-08 18:27:54 -07:00
Lin f545434f65 Merge pull request #13072 from silicons/fancy_floor 
fixes runtimes from people screwdrivering wooden floors
 2020-08-08 20:02:55 -05:00
silicons fd9e3f5079 hugbox 2020-08-08 18:01:15 -07:00
chrisbbbbbbb 885013a8b8 suture crafting stuff 2020-08-08 23:13:03 +02:00
Putnam 8f77a2b16d Demodularized a bit. 2020-08-08 13:38:33 -07:00
Hatterhat a496588171 bokken cooldown nerf but slightly 2020-08-08 14:31:45 -05:00
Hatterhat c7e850ae19 longparry stagger reduced, cooldown made universal 2020-08-08 14:14:47 -05:00
Hatterhat 98d305e5f6 bokken nerfs, desword deflects 2020-08-08 14:11:47 -05:00
Dip ab2de2e55c Added Skulldoggo Snout 2020-08-08 16:01:37 -03:00
Hatterhat e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Lin dea2dab536 Merge pull request #13055 from Citadel-Station-13/silicons-patch-78 
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
 2020-08-08 12:06:42 -05:00
Lin 13d94717f4 Merge pull request #13052 from Citadel-Station-13/silicons-patch-76 
fixes laptops not being able to be picked up
 2020-08-08 12:05:36 -05:00