shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,226 Commits 5 Branches 0 Tags
d58697c78db56ea5793dfe4bf6affc9fe9b4f2da
Commit Graph

42226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr 
the loadout now recognises collars as polychromic items
 2021-03-24 19:23:58 -06:00
CitadelStationBot
7869a5da75 Automatic changelog generation for PR #14507 [ci skip] 2021-03-24 20:23:04 -05:00
silicons
0845840f5e Merge pull request #14507 from CuteMoff/thisismydiamondsword 
Added "Diamond Ingots" for Blacksmithing
 2021-03-24 19:23:02 -06:00
CitadelStationBot
3164c2ace1 Automatic changelog generation for PR #14497 [ci skip] 2021-03-24 20:22:39 -05:00
silicons
602140af99 Merge pull request #14497 from Hatterhat/lever-guns 
.38 lever-action rifles but not actually implemented
 2021-03-24 19:22:36 -06:00
silicons
e7e13a8e47 Merge pull request #14499 from DeltaFire15/get-out-bot 
Time to stuff the fix-feature bot back into its locker
 2021-03-24 19:22:28 -06:00
silicons
73c0b9263b Merge pull request #14508 from LetterN/BEGONE-QDEL 
Properly fixes cargo console hacking
 2021-03-24 19:21:22 -06:00
Changelogs
cfd95c68da Automatic changelog compile [ci skip] 2021-03-25 00:08:13 +00:00
CitadelStationBot
0ded71d196 Automatic changelog generation for PR #14483 [ci skip] 2021-03-24 00:47:47 -05:00
DeltaFire
086bb75006 Merge pull request #14483 from zeroisthebiggay/patch-6 
makes strained muscles slightly less absurd by adding a proper chemical slowdown
 2021-03-24 06:47:45 +01:00
LetterN
cdf589d828 proper fix aoaooa 2021-03-24 13:26:43 +08:00
CuteMoff
ea200acd9f Update code/game/objects/items/stacks/sheets/mineral.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-03-23 23:17:24 -04:00
CuteMoff
9d8c7dff35 Update code/modules/smithing/smithed_items.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-03-23 23:15:03 -04:00
CuteMoff
a51a1ae68f Update mineral.dm 2021-03-23 21:24:11 -04:00
CuteMoff
99caab1ec8 Update smithed_items.dm 2021-03-23 21:08:11 -04:00
CuteMoff
048b8548ad Update mineral.dm 2021-03-23 20:53:07 -04:00
CuteMoff
428591c452 Update mineral.dm 2021-03-23 20:36:48 -04:00
CuteMoff
ee4fad7966 Update basemats.dm 2021-03-23 20:34:17 -04:00
zeroisthebiggay
513b98f3e0 Update strained_muscles.dm 2021-03-23 20:28:46 -04:00
Changelogs
0cefa7f470 Automatic changelog compile [ci skip] 2021-03-24 00:15:18 +00:00
Hatterhat
30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
Lin
ebf652f736 Merge pull request #14472 from silicons/sigh_615 
makes the global antag disable pref more clear. forces savefile update to default all players to having the **disable** *disabled* (i love double negatives).
 2021-03-23 17:53:50 -05:00
CitadelStationBot
bbb0ffa2f1 Automatic changelog generation for PR #14498 [ci skip] 2021-03-23 17:15:29 -05:00
DeltaFire
20cd8568e8 Merge pull request #14498 from Hatterhat/patch-2 
medsuture/medmesh recipe buff
 2021-03-23 23:15:26 +01:00
CitadelStationBot
d57c35de87 Automatic changelog generation for PR #14430 [ci skip] 2021-03-23 16:35:57 -05:00
DeltaFire
afd8af60e3 Merge pull request #14430 from YakumoChen/genetics 
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
 2021-03-23 22:35:54 +01:00
CitadelStationBot
111074b8a6 Automatic changelog generation for PR #14481 [ci skip] 2021-03-23 16:34:02 -05:00
Lin
79beaa97eb Merge pull request #14481 from BlueWildrose/ewwghostpuddles 
Nightmares' light eater can now destroy messes that emit light
 2021-03-23 16:33:59 -05:00
Timothy Teakettle
7d4284b086 Update neck.dm 2021-03-23 21:33:50 +00:00
CitadelStationBot
32f4938eb9 Automatic changelog generation for PR #14484 [ci skip] 2021-03-23 16:22:29 -05:00
Lin
b7f8deaf38 Merge pull request #14484 from zeroisthebiggay/cumbranch 
biodegrade works on legcuffs
 2021-03-23 16:22:26 -05:00
CitadelStationBot
3b28170fa9 Automatic changelog generation for PR #14473 [ci skip] 2021-03-22 22:15:16 -05:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06:00
CitadelStationBot
e4a1c612cd Automatic changelog generation for PR #14475 [ci skip] 2021-03-22 22:14:59 -05:00
silicons
bfb122d706 Merge pull request #14475 from qweq12yt/black-market-fixes 
Black Market: The return
 2021-03-22 21:14:57 -06:00
DeltaFire
a1e9b61eb1 stop 2021-03-23 03:50:57 +01:00
Hatterhat
d9977e24b5 Update medicine.dm 2021-03-22 21:29:48 -05:00
Hatterhat
6bac90f8de uhh initial commit ig 2021-03-22 21:23:00 -05:00
CitadelStationBot
a3c2e0c938 Automatic changelog generation for PR #14491 [ci skip] 2021-03-22 19:55:15 -05:00
Lin
dd764ceb0e Merge pull request #14491 from Hatterhat/triggerfix 
noguns now takes precedence over trigger guard
 2021-03-22 19:55:12 -05:00
CitadelStationBot
249b9a61c7 Automatic changelog generation for PR #14447 [ci skip] 2021-03-22 19:52:45 -05:00
Lin
715f86ef5c Merge pull request #14447 from LetterN/fixes-2 
Fixes laptop and tweaks stacks
 2021-03-22 19:52:42 -05:00
Lin
fbe4e1d4e4 Merge pull request #14488 from Citadel-Station-13/silicons-patch-11 
fixes TCG binder loading causing every latejoin to runtime out of EquipRank
 2021-03-22 19:51:10 -05:00
Changelogs
a27f03aa65 Automatic changelog compile [ci skip] 2021-03-23 00:15:15 +00:00
CitadelStationBot
ec7714351a Automatic changelog generation for PR #14489 [ci skip] 2021-03-22 15:37:59 -05:00
Lin
4e641eedb9 Merge pull request #14489 from LetterN/amogus 
Fixes NIRM
 2021-03-22 15:37:56 -05:00
LetterN
760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-22 09:32:21 +08:00
Hatterhat
722b50088a message tweak 
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
 2021-03-21 19:26:34 -05:00
Hatterhat
a8e4466476 sigh 2021-03-21 18:16:22 -05:00
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00