shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613 kevinz000 2020-03-10 05:56:28 -07:00
  • 040c84b55f Automatic changelog generation for PR #11397 [ci skip] CitadelStationBot 2020-03-10 07:56:10 -05:00
  • aca1d70bbb Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy kevinz000 2020-03-10 05:56:08 -07:00
  • 39a949f223 remove that kevinz000 2020-03-10 05:50:57 -07:00
  • e0df350579 PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals. necromanceranne 2020-03-10 23:21:59 +11:00
  • b03d83926a Forgot the scroll necromanceranne 2020-03-10 20:27:40 +11:00
  • f41f78b162 Massively refactors martial arts, ports New Sleeping Carp necromanceranne 2020-03-10 20:09:31 +11:00
  • 9a9bd2f575 woops kevinz000 2020-03-10 01:12:58 -07:00
  • 8a452b7f09 Food Craft Speed Winter Flare 2020-03-10 01:43:18 -04:00
  • eaab44735b Fix Fiesta Skewer Winter Flare 2020-03-10 01:01:23 -04:00
  • 9ec222e5b4 Empowered Burger Winter Flare 2020-03-10 00:53:42 -04:00
  • 269b7c2939 k kevinz000 2020-03-09 21:06:00 -07:00
  • bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614 kevinz000 2020-03-09 21:01:51 -07:00
  • 8a1b57f10b k kevinz000 2020-03-09 21:01:03 -07:00
  • d9a0d610c0 Automatic changelog generation for PR #11403 [ci skip] CitadelStationBot 2020-03-09 21:28:05 -05:00
  • f444020741 Merge pull request #11403 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-03-09 19:28:02 -07:00
  • 5a18d143a9 Removed extraneous apply_innate_effects Putnam 2020-03-09 18:47:42 -07:00
  • f19647acc7 Fixed uplinks not being given to traitors. Putnam 2020-03-09 18:47:06 -07:00
  • 17007182c9 Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604 Ghommie 2020-03-09 22:42:31 +01:00
  • aa8dc93a5d locate textref. Ghommie 2020-03-09 22:27:27 +01:00
  • 80eaf3be0d Update _drone.dm Ghom 2020-03-09 22:22:38 +01:00
  • 0400fbf8a2 Update constructs.dm Ghom 2020-03-09 22:21:32 +01:00
  • 0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 Ghommie 2020-03-09 21:53:22 +01:00
  • 8e030763b6 Odd but ok? Trilbyspaceclone 2020-03-09 12:38:45 -04:00
  • d0a58ce9fa Automatic changelog generation for PR #11371 [ci skip] CitadelStationBot 2020-03-09 11:07:48 -05:00
  • 29346f7827 Merge pull request #11371 from keronshb/BlobRefactor Ghom 2020-03-09 17:07:45 +01:00
  • 126d80e1de Automatic changelog generation for PR #11382 [ci skip] CitadelStationBot 2020-03-09 10:50:36 -05:00
  • 503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit Ghom 2020-03-09 16:50:32 +01:00
  • ea556e6357 [s] Ports "Fixes gibber part update" Ghom 2020-03-09 16:41:56 +01:00
  • 4143c1963c Porting more legcuffs / bola fixes etcetera Ghommie 2020-03-09 16:20:51 +01:00
  • 4968c22b5f sprites! TrilbySpaceClone 2020-03-09 08:47:56 -04:00
  • 067e2e4506 probably fixes hulk Seris02 2020-03-09 18:15:12 +08:00
  • 68382d65c8 normalising wagging tail names Seris02 2020-03-09 17:48:12 +08:00
  • cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2020-03-09 16:49:32 +08:00
  • 9b66940807 fixes the web Seris02 2020-03-09 16:27:46 +08:00
  • 878947bf7e Automatic changelog generation for PR #11393 [ci skip] CitadelStationBot 2020-03-08 23:29:13 -05:00
  • 3da09077ec Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-03-08 21:29:10 -07:00
  • d7c5b87263 Update action.dm kevinz000 2020-03-08 21:24:52 -07:00
  • c079dba753 its a fucking helmet ZeroMan 2020-03-08 23:07:24 -04:00
  • ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" Ghommie 2020-03-09 04:01:23 +01:00
  • 7e1e905a95 Line ending changes, I hope keronshb 2020-03-08 20:36:05 -04:00
  • f1d6360b70 Shuttle timer display seconds fix Ghom 2020-03-09 01:31:39 +01:00
  • 0d3da4fcc0 maybe? last go? 2 keronshb 2020-03-08 20:11:13 -04:00
  • 94958581b9 maybe? last go? keronshb 2020-03-08 20:10:34 -04:00
  • f8c18fe5a8 Update PDA.dm Ghom 2020-03-09 00:52:11 +01:00
  • fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor Pne more test go keronshb 2020-03-08 19:48:30 -04:00
  • 0d66a40e55 Automatic changelog generation for PR #11377 [ci skip] CitadelStationBot 2020-03-08 18:26:56 -05:00
  • 1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes Ghom 2020-03-09 00:26:54 +01:00
  • c063558c6e Automatic changelog generation for PR #11317 [ci skip] CitadelStationBot 2020-03-08 18:26:08 -05:00
  • 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI Ghom 2020-03-09 00:26:06 +01:00
  • 7955ca4f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor Trying to fix this shit again keronshb 2020-03-08 19:17:28 -04:00
  • aa25547ce3 Automatic changelog generation for PR #11288 [ci skip] CitadelStationBot 2020-03-08 18:01:14 -05:00
  • 1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 Ghom 2020-03-09 00:01:12 +01:00
  • d460f5359e Hopefully this will fix it? keronshb 2020-03-08 18:49:18 -04:00
  • 9b63c7aa11 Trying to see if this will fix the line end issue keronshb 2020-03-08 18:48:42 -04:00
  • bceed5d002 Update recipes_clothing.dm Ghom 2020-03-08 23:46:33 +01:00
  • 187de6869f Webedit fixing bloodsucker mesmerize Ghom 2020-03-08 23:38:30 +01:00
  • 388891bde3 fianlly ive discovered obanium ZeroMan 2020-03-08 18:31:12 -04:00
  • 59b1a223a3 Ok, done. Ghommie 2020-03-08 22:51:36 +01:00
  • 0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor To fixs something? keronshb 2020-03-08 17:51:17 -04:00
  • eacdc3b438 Let gorlex marauders contract, and made them hijack 2x as fast as other traitors Putnam 2020-03-08 14:05:04 -07:00
  • 5aea1c3b0e okay lets try again ZeroMan 2020-03-08 15:45:51 -04:00
  • 1941169582 will this fucking work ZeroMan 2020-03-08 15:45:35 -04:00
  • bb9066e9cb Food Additions / Butter Bear Winter Flare 2020-03-08 14:36:08 -04:00
  • ad4d290ea7 WIP Ghommie 2020-03-08 19:26:01 +01:00
  • 274b9c28b3 Merge pull request #11264 from Ghommie/Ghommie-cit592 kevinz000 2020-03-08 11:10:30 -07:00
  • 70d302f10d Automatic changelog generation for PR #11372 [ci skip] CitadelStationBot 2020-03-08 13:10:04 -05:00
  • b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610 kevinz000 2020-03-08 11:10:02 -07:00
  • 5add119388 Merge pull request #11374 from Detective-Google/AI-cryo kevinz000 2020-03-08 11:09:48 -07:00
  • 2b99f729e6 Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-03-08 11:09:17 -07:00
  • a180d9c704 Automatic changelog generation for PR #11365 [ci skip] CitadelStationBot 2020-03-08 10:15:14 -05:00
  • 2b5f337f06 Merge pull request #11365 from Ghommie/Ghommie-cit607 kevinz000 2020-03-08 08:15:11 -07:00
  • bc0d1bbe73 Automatic changelog generation for PR #11357 [ci skip] CitadelStationBot 2020-03-08 10:15:01 -05:00
  • 36f1e952b4 Merge pull request #11357 from Ghommie/Ghommie-cit606 kevinz000 2020-03-08 08:14:58 -07:00
  • 3c066aa771 Update pai_shell.dm Ghom 2020-03-08 15:46:38 +01:00
  • d78926b269 Automatic changelog generation for PR #11369 [ci skip] CitadelStationBot 2020-03-08 09:34:51 -05:00
  • c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609 kevinz000 2020-03-08 07:34:48 -07:00
  • 7ad2c6dce0 Update pai.dm Ghom 2020-03-08 14:55:15 +01:00
  • 8f6677326d Update pai.dm Ghom 2020-03-08 14:51:41 +01:00
  • a0e5f1651e Update pai_shell.dm Ghom 2020-03-08 14:49:43 +01:00
  • 4a61dc7b72 tgstation PR #48189 by Yenwodyah Ghom 2020-03-08 14:10:34 +01:00
  • 57ba56d3bc Update handcuffs.dm Ghom 2020-03-08 14:09:59 +01:00
  • 31599f669a Update BoxStation.dmm bunny232 2020-03-08 07:28:00 -04:00
  • 3a94961b6a Merge pull request #1 from Citadel-Station-13/master bunny232 2020-03-08 07:19:42 -04:00
  • ea1bb1812c Merge pull request #11370 from Citadel-Station-13/Ghommie-patch-1 Lin 2020-03-08 01:26:39 -06:00
  • d4e4f357d4 Automatic changelog generation for PR #11383 [ci skip] CitadelStationBot 2020-03-08 00:18:11 -06:00
  • 57db0e0320 Merge pull request #11383 from Putnam3145/fix-storyteller-weights Ghom 2020-03-08 07:18:09 +01:00
  • d25ec08da8 Update PDA.dm Ghom 2020-03-08 07:13:08 +01:00
  • dfa7637f1b fixes storyteller weights Putnam 2020-03-07 22:09:20 -08:00
  • ecba3d0ebe Automatic changelog generation for PR #11368 [ci skip] CitadelStationBot 2020-03-07 22:33:23 -06:00
  • a41d1eaa8b Merge pull request #11368 from Putnam3145/eigenstasium-nope Ghom 2020-03-08 05:33:20 +01:00
  • 926fd79634 k kevinz000 2020-03-07 20:24:51 -08:00
  • 3ee4a1f81e wrong branch shit fuck ZeroMan 2020-03-07 23:24:14 -05:00
  • a431bdb0de okay here we go ZeroMan 2020-03-07 23:20:01 -05:00
  • 038f37d309 Something about layers. Ghom 2020-03-08 05:10:03 +01:00
  • 4a3b437241 Check keronshb 2020-03-07 23:54:25 -04:00
  • 5015726a48 Uncheck keronshb 2020-03-07 23:52:01 -04:00
  • 7b33cea762 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mapping ZeroMan 2020-03-07 22:19:15 -05:00
  • d5cca4897a Fixed conflict? keronshb 2020-03-07 23:18:03 -04:00
  • 26df8eb9c6 Ok the real fix this time keronshb 2020-03-07 23:05:00 -04:00