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

Commit Graph

  • ebb233ab36 More supernova adjustments Putnam 2021-03-24 18:21:26 -07:00
  • 73c0b9263b Merge pull request #14508 from LetterN/BEGONE-QDEL silicons 2021-03-24 19:21:22 -06:00
  • aafd1ca6bc Automatic changelog compile [ci skip] Changelogs 2021-03-25 00:36:12 +00:00
  • 18ce504f06 oh and this should not go up infinitely Putnam 2021-03-24 17:24:13 -07:00
  • 254187bc2e it's not a global proc Putnam 2021-03-24 17:23:21 -07:00
  • cfd95c68da Automatic changelog compile [ci skip] Changelogs 2021-03-25 00:08:13 +00:00
  • 45340ef1ac Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed. necromanceranne 2021-03-25 09:27:33 +11:00
  • 79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. necromanceranne 2021-03-25 09:07:52 +11:00
  • 32be7ecabd Adjusts blackmarket uplink R3dtail 2021-03-24 16:53:41 -05:00
  • efe669e0c5 Update changelog.html dzahlus 2021-03-24 19:16:00 +01:00
  • 83102b056b Update miscellaneous.dm dzahlus 2021-03-24 19:14:52 +01:00
  • e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny LetterN 2021-03-24 21:55:47 +08:00
  • 123dfd8eda map men map men map map map men men men LetterN 2021-03-24 21:31:06 +08:00
  • 0ded71d196 Automatic changelog generation for PR #14483 [ci skip] CitadelStationBot 2021-03-24 00:47:47 -05:00
  • 086bb75006 Merge pull request #14483 from zeroisthebiggay/patch-6 DeltaFire 2021-03-24 06:47:45 +01:00
  • cdf589d828 proper fix aoaooa LetterN 2021-03-24 13:26:43 +08:00
  • ea200acd9f Update code/game/objects/items/stacks/sheets/mineral.dm CuteMoff 2021-03-23 23:17:24 -04:00
  • 9d8c7dff35 Update code/modules/smithing/smithed_items.dm CuteMoff 2021-03-23 23:15:03 -04:00
  • a51a1ae68f Update mineral.dm CuteMoff 2021-03-23 21:24:11 -04:00
  • 99caab1ec8 Update smithed_items.dm CuteMoff 2021-03-23 21:08:11 -04:00
  • 048b8548ad Update mineral.dm CuteMoff 2021-03-23 20:53:07 -04:00
  • 428591c452 Update mineral.dm CuteMoff 2021-03-23 20:36:48 -04:00
  • ee4fad7966 Update basemats.dm CuteMoff 2021-03-23 20:34:17 -04:00
  • 513b98f3e0 Update strained_muscles.dm zeroisthebiggay 2021-03-23 20:28:46 -04:00
  • 0cefa7f470 Automatic changelog compile [ci skip] Changelogs 2021-03-24 00:15:18 +00:00
  • 9750580fb5 Automatic changelog compile [ci skip] Changelogs 2021-03-24 00:02:11 +00:00
  • 30a9ad5059 yeehaw :) Hatterhat 2021-03-23 18:55:00 -05:00
  • ebf652f736 Merge pull request #14472 from silicons/sigh_615 Lin 2021-03-23 17:53:50 -05:00
  • 14ba2b3da1 OOPS Timothy Teakettle 2021-03-23 22:40:27 +00:00
  • bbb0ffa2f1 Automatic changelog generation for PR #14498 [ci skip] CitadelStationBot 2021-03-23 17:15:29 -05:00
  • 20cd8568e8 Merge pull request #14498 from Hatterhat/patch-2 DeltaFire 2021-03-23 23:15:26 +01:00
  • fa541671d6 yes Timothy Teakettle 2021-03-23 21:44:19 +00:00
  • 0a48fbfeba Update loadout.dm Timothy Teakettle 2021-03-23 21:39:55 +00:00
  • d57c35de87 Automatic changelog generation for PR #14430 [ci skip] CitadelStationBot 2021-03-23 16:35:57 -05:00
  • afd8af60e3 Merge pull request #14430 from YakumoChen/genetics DeltaFire 2021-03-23 22:35:54 +01:00
  • 111074b8a6 Automatic changelog generation for PR #14481 [ci skip] CitadelStationBot 2021-03-23 16:34:02 -05:00
  • 79beaa97eb Merge pull request #14481 from BlueWildrose/ewwghostpuddles Lin 2021-03-23 16:33:59 -05:00
  • 7d4284b086 Update neck.dm Timothy Teakettle 2021-03-23 21:33:50 +00:00
  • 32f4938eb9 Automatic changelog generation for PR #14484 [ci skip] CitadelStationBot 2021-03-23 16:22:29 -05:00
  • b7f8deaf38 Merge pull request #14484 from zeroisthebiggay/cumbranch Lin 2021-03-23 16:22:26 -05:00
  • f600e51408 i hate kitsune players so i hope you appreciate me adding more cringe to your arsenal zerothebigboy 2021-03-23 15:50:13 -04:00
  • e70b03f770 fixes/balaces derringer/wind-up gun qweq12yt 2021-03-17 15:13:35 -03:00
  • 3b5ebd1149 windup fixes, derringer balancing? qweq12yt 2021-03-16 16:38:40 -03:00
  • a16f5d04b7 partial derringer - windup needs balance qweq12yt 2021-03-16 02:54:13 -03:00
  • eb0973969d Merge branch 'master' into joy Fabian 2021-03-23 20:28:09 +01:00
  • 27d73e563e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Fabian 2021-03-23 20:05:40 +01:00
  • 989ed923d8 accidental powergame armor removal Fabian 2021-03-23 20:02:07 +01:00
  • d7bdfbc35b this is the last conflict i'm gonna fix i swear to god i hate you all zerothebigboy 2021-03-23 13:29:09 -04:00
  • 263c564170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-03-23 13:25:13 -04:00
  • 89fdeb65c5 Adds small walk hud icons Shadow Quill 2021-03-23 01:38:45 -05:00
  • 3b28170fa9 Automatic changelog generation for PR #14473 [ci skip] CitadelStationBot 2021-03-22 22:15:16 -05:00
  • 5910950a49 Merge pull request #14473 from ItzGabby/bark-box silicons 2021-03-22 21:15:14 -06:00
  • e4a1c612cd Automatic changelog generation for PR #14475 [ci skip] CitadelStationBot 2021-03-22 22:14:59 -05:00
  • bfb122d706 Merge pull request #14475 from qweq12yt/black-market-fixes silicons 2021-03-22 21:14:57 -06:00
  • a1e9b61eb1 stop DeltaFire 2021-03-23 03:50:57 +01:00
  • d9977e24b5 Update medicine.dm Hatterhat 2021-03-22 21:29:48 -05:00
  • 6bac90f8de uhh initial commit ig Hatterhat 2021-03-22 21:23:00 -05:00
  • e5c01bc0f8 limbgrower limbs can be used in augmentations Hatterhat 2021-03-22 20:15:01 -05:00
  • a3c2e0c938 Automatic changelog generation for PR #14491 [ci skip] CitadelStationBot 2021-03-22 19:55:15 -05:00
  • dd764ceb0e Merge pull request #14491 from Hatterhat/triggerfix Lin 2021-03-22 19:55:12 -05:00
  • 249b9a61c7 Automatic changelog generation for PR #14447 [ci skip] CitadelStationBot 2021-03-22 19:52:45 -05:00
  • 715f86ef5c Merge pull request #14447 from LetterN/fixes-2 Lin 2021-03-22 19:52:42 -05:00
  • fbe4e1d4e4 Merge pull request #14488 from Citadel-Station-13/silicons-patch-11 Lin 2021-03-22 19:51:10 -05:00
  • a27f03aa65 Automatic changelog compile [ci skip] Changelogs 2021-03-23 00:15:15 +00:00
  • ec7714351a Automatic changelog generation for PR #14489 [ci skip] CitadelStationBot 2021-03-22 15:37:59 -05:00
  • 4e641eedb9 Merge pull request #14489 from LetterN/amogus Lin 2021-03-22 15:37:56 -05:00
  • a3b1e44f32 Fixes reactions breaking and maybe scrubber duping? Putnam 2021-03-22 01:11:00 -07:00
  • 760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 LetterN 2021-03-22 09:32:21 +08:00
  • 722b50088a message tweak Hatterhat 2021-03-21 19:26:34 -05:00
  • a8e4466476 sigh Hatterhat 2021-03-21 18:16:22 -05:00
  • 86b8bbf727 no more free shipping LetterN 2021-03-21 21:44:04 +08:00
  • 4e22ad7484 Update job.dm silicons 2021-03-21 02:07:03 -07:00
  • 661ed14c83 Update job.dm silicons 2021-03-21 02:05:43 -07:00
  • 8d9c4f55d6 no dumb names LetterN 2021-03-21 13:51:08 +08:00
  • ce3c4e99ea fix-but-its-in-the-wrong-branch LetterN 2021-03-21 13:46:18 +08:00
  • f1e55f2df0 Paranoid updates to maybe fix air duplication Putnam 2021-03-20 22:02:47 -07:00
  • 0b5cedf893 patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures (#57380) keronshb 2021-03-20 20:40:51 -04:00
  • 2977784a25 Automatic changelog compile [ci skip] Changelogs 2021-03-21 00:15:30 +00:00
  • 7a334b8a61 Merge remote-tracking branch 'upstream/master' keronshb 2021-03-20 20:06:11 -04:00
  • b292fcb1dd Update strained_muscles.dm zeroisthebiggay 2021-03-20 19:52:39 -04:00
  • f4b3d7274c Update strained_muscles.dm zeroisthebiggay 2021-03-20 19:50:13 -04:00
  • bc3a2e19b2 Update strained_muscles.dm zeroisthebiggay 2021-03-20 19:44:41 -04:00
  • 531409e472 Update strained_muscles.dm zeroisthebiggay 2021-03-20 19:39:57 -04:00
  • 1fd06a89b7 Oh Boy silicons 2021-03-20 16:27:52 -07:00
  • 969f64af1a f u c k zerothebigboy 2021-03-20 19:23:55 -04:00
  • 02b52e6142 framework silicons 2021-03-20 16:02:26 -07:00
  • efa4139aff math fix silicons 2021-03-20 14:17:13 -07:00
  • 5b2a42f254 Merge remote-tracking branch 'citadel/master' into combat_v7 silicons 2021-03-20 14:13:23 -07:00
  • 957c1fcc5d okay silicons 2021-03-20 14:09:23 -07:00
  • 427919d147 whew silicons 2021-03-20 13:57:48 -07:00
  • 604a6efeca baton change silicons 2021-03-20 13:45:39 -07:00
  • 15dd80a085 less awful silicons 2021-03-20 13:39:59 -07:00
  • a970c73960 Automatic changelog generation for PR #14323 [ci skip] CitadelStationBot 2021-03-20 15:32:16 -05:00
  • 720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more silicons 2021-03-20 14:32:14 -06:00
  • fb340ed368 Automatic changelog generation for PR #14405 [ci skip] CitadelStationBot 2021-03-20 15:31:17 -05:00
  • 295255e46e Merge pull request #14405 from Arturlang/vampire_death silicons 2021-03-20 14:31:14 -06:00
  • 3c23122ad7 Merge pull request #14468 from LetterN/patch-6 silicons 2021-03-20 14:30:18 -06:00
  • c1e4156762 Automatic changelog generation for PR #14469 [ci skip] CitadelStationBot 2021-03-20 15:30:12 -05:00
  • af540ba4ef Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo silicons 2021-03-20 14:30:10 -06:00
  • 1d9f074507 Automatic changelog generation for PR #14436 [ci skip] CitadelStationBot 2021-03-20 15:29:43 -05:00