shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,788 Commits 5 Branches 0 Tags
2db0511d0dd9b32edb8612a00a763ea0fae881fb
Commit Graph

44788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Brown 2db0511d0d Removes a dead var 2021-09-27 12:20:37 -04:00
CitadelStationBot e893141573 Automatic changelog generation for PR #15210 [ci skip] 2021-09-27 10:49:05 -05:00
zeroisthebiggay 41169d4366 helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210) 
* .

* .
 2021-09-27 17:49:01 +02:00
Changelogs 1992bf7cfb Automatic changelog compile [ci skip] 2021-09-27 00:26:02 +00:00
CitadelStationBot 11e70bf044 Automatic changelog generation for PR #15205 [ci skip] 2021-09-26 15:30:43 -05:00
silicons ec3fbed5bb Merge pull request #15205 from zeroisthebiggay/patch-28 
fixes code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
 2021-09-26 13:30:40 -07:00
CitadelStationBot 4e2801a0dd Automatic changelog generation for PR #15200 [ci skip] 2021-09-26 12:04:29 -05:00
Lin 27aaaecb52 Merge pull request #15200 from zeroisthebiggay/patch-27 
fixes yet another emeraldsundisk map pr which was not spawning because the Ruin Didn't Actually Exist.
 2021-09-26 12:04:27 -05:00
silicons 6c00bb8dce Update living_blocking_parrying.dm (#15208) 2021-09-26 15:41:09 +02:00
zeroisthebiggay be82bd310e Update plaguerat.dm 2021-09-25 19:17:43 -04:00
zeroisthebiggay 58df5b70bf Update plaguerat.dm 2021-09-25 19:09:22 -04:00
Changelogs 53f75ec0cf Automatic changelog compile [ci skip] 2021-09-25 00:26:03 +00:00
CitadelStationBot 410bac5685 Automatic changelog generation for PR #15192 [ci skip] 2021-09-24 19:14:16 -05:00
Lin c991a3004a Merge pull request #15192 from buffyuwu/accordion 
ports a downstream fix of accordions
 2021-09-24 19:14:14 -05:00
zeroisthebiggay 72cb19eb3f Update space.dm 2021-09-24 19:15:32 -04:00
zeroisthebiggay 5366a09c8b Update spaceRuinBlacklist.txt 2021-09-24 18:38:58 -04:00
zeroisthebiggay c633c95919 Update space.dm 2021-09-24 18:35:49 -04:00
Changelogs 70cdd264dc Automatic changelog compile [ci skip] 2021-09-24 00:26:31 +00:00
CitadelStationBot 7623ea9558 Automatic changelog generation for PR #15183 [ci skip] 2021-09-23 12:20:18 -05:00
zeroisthebiggay 7ba7f0d1c1 gremlins become shock immune (#15183) 
* Update gremlin.dm

* Update gremlin.dm
 2021-09-23 19:20:15 +02:00
Changelogs fc73e2944f Automatic changelog compile [ci skip] 2021-09-23 00:27:37 +00:00
CitadelStationBot ae4f7076dc Automatic changelog generation for PR #15187 [ci skip] 2021-09-22 14:50:30 -05:00
Lin f8ac9af6d0 Merge pull request #15187 from KrabSpider/krabgenics 
blacklists cryogenics from anomaly spawns
 2021-09-22 14:50:28 -05:00
CitadelStationBot e8617448ef Automatic changelog generation for PR #15190 [ci skip] 2021-09-22 14:50:00 -05:00
Lin 4e9e98367f Merge pull request #15190 from buffyuwu/canvas 
adds art supplies to the fun vendor
 2021-09-22 14:49:57 -05:00
buffyuwu 2522b84667 ports a downstream fix of accordions 
while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee
 2021-09-22 01:56:13 -04:00
Changelogs 989888fb24 Automatic changelog compile [ci skip] 2021-09-22 00:26:18 +00:00
buffyuwu dbd6014129 adds art supplies to the fun vendor 
because some maps don't have the canvas/easel

🆑
add: canvas and spraycan are now sold in the fun vendor
/🆑
 2021-09-21 01:16:03 -04:00
CitadelStationBot a81238f50d Automatic changelog generation for PR #15182 [ci skip] 2021-09-21 00:00:22 -05:00
Lin ad4cb7ea0e Merge pull request #15182 from Citadel-Station-13/silicons-patch-3 
reverts my limb damage changes
 2021-09-21 00:00:20 -05:00
CitadelStationBot c73455da7a Automatic changelog generation for PR #15181 [ci skip] 2021-09-20 23:59:56 -05:00
Lin ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches 
no more powergaming dice bags
 2021-09-20 23:59:53 -05:00
Lin a084733397 Merge pull request #15179 from Citadel-Station-13/why 
adds policy configs for elite fauna and prisoner role
 2021-09-20 23:58:21 -05:00
Lin 7a5e748344 Merge pull request #15185 from Citadel-Station-13/silicons-patch-6 
fixes airlock deflection
 2021-09-20 23:53:53 -05:00
CitadelStationBot ff64050f8a Automatic changelog generation for PR #15184 [ci skip] 2021-09-20 23:53:29 -05:00
Lin 318a80370e Merge pull request #15184 from Citadel-Station-13/silicons-patch-5 
Fixes crawling not overriding new reagent speedups
 2021-09-20 23:53:26 -05:00
KrabSpider 11a414d8c8 blacklists cryogenics from anomaly spawns 
adds cryogenics to the anomaly blacklist.
 2021-09-20 16:41:40 -04:00
Changelogs 605aa0aa11 Automatic changelog compile [ci skip] 2021-09-20 00:29:38 +00:00
CitadelStationBot 433a92908e Automatic changelog generation for PR #14219 [ci skip] 2021-09-19 16:54:39 -05:00
silicons e06926899d Merge pull request #14219 from zeroisthebiggay/ninjasarecum 
[DONE basically] ports TG ninja rework plus tons of stuff
 2021-09-19 14:54:37 -07:00
silicons 6d99bca184 Update obj_defense.dm 2021-09-19 14:46:09 -07:00
silicons 84a26eeabd Update obj_defense.dm 2021-09-19 14:45:24 -07:00
silicons 17cd5c5d84 Update mobs.dm 2021-09-19 13:46:08 -07:00
zeroisthebiggay 7fce515ca4 Update robot_modules.dm 2021-09-19 16:01:29 -04:00
zeroisthebiggay 4ab88cfcdb Update robot_modules.dm 2021-09-19 15:59:45 -04:00
zeroisthebiggay 2f903353a6 Update robot_modules.dm 2021-09-19 15:56:40 -04:00
zeroisthebiggay 03704c054a Update tgstation.dme 2021-09-19 15:31:34 -04:00
zeroisthebiggay e5b2ab19c0 Update tgstation.dme 2021-09-19 15:27:51 -04:00
zeroisthebiggay d6516d25de Update tgstation.dme 2021-09-19 15:27:23 -04:00
zerothebigboy ce43b1b49e Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:25:42 -04:00