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

27601 Commits

Author SHA1 Message Date
silicons
0845840f5e Merge pull request #14507 from CuteMoff/thisismydiamondsword 
Added "Diamond Ingots" for Blacksmithing
 2021-03-24 19:23:02 -06: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
73c0b9263b Merge pull request #14508 from LetterN/BEGONE-QDEL 
Properly fixes cargo console hacking
 2021-03-24 19:21:22 -06: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
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
DeltaFire
20cd8568e8 Merge pull request #14498 from Hatterhat/patch-2 
medsuture/medmesh recipe buff
 2021-03-23 23:15:26 +01: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
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
Lin
b7f8deaf38 Merge pull request #14484 from zeroisthebiggay/cumbranch 
biodegrade works on legcuffs
 2021-03-23 16:22:26 -05:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06:00
silicons
bfb122d706 Merge pull request #14475 from qweq12yt/black-market-fixes 
Black Market: The return
 2021-03-22 21:14:57 -06: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
Lin
dd764ceb0e Merge pull request #14491 from Hatterhat/triggerfix 
noguns now takes precedence over trigger guard
 2021-03-22 19:55:12 -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
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
silicons
4e22ad7484 Update job.dm 2021-03-21 02:07:03 -07:00
silicons
661ed14c83 Update job.dm 2021-03-21 02:05:43 -07:00
LetterN
8d9c4f55d6 no dumb names 2021-03-21 13:51:08 +08:00
LetterN
ce3c4e99ea fix-but-its-in-the-wrong-branch 2021-03-21 13:46:18 +08:00
zeroisthebiggay
b292fcb1dd Update strained_muscles.dm 2021-03-20 19:52:39 -04:00
zeroisthebiggay
f4b3d7274c Update strained_muscles.dm 2021-03-20 19:50:13 -04:00
zeroisthebiggay
bc3a2e19b2 Update strained_muscles.dm 2021-03-20 19:44:41 -04:00
zeroisthebiggay
531409e472 Update strained_muscles.dm 2021-03-20 19:39:57 -04:00
zerothebigboy
969f64af1a f u c k 2021-03-20 19:23:55 -04:00
silicons
720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more 
Hierophant staff no longer deals 30 damage
 2021-03-20 14:32:14 -06:00
silicons
295255e46e Merge pull request #14405 from Arturlang/vampire_death 
Makes vampries dust when they can't pay the blood cost, not before
 2021-03-20 14:31:14 -06:00
silicons
af540ba4ef Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo 
fixes puddles breaking
 2021-03-20 14:30:10 -06:00
silicons
74e26f7a0c Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance 
Buffed supermatter surge to make it up to 50x as strong as before.
 2021-03-20 14:29:40 -06:00
silicons
e433aaf881 Merge pull request #14464 from GrayRachnid/filter 
Enables the in character filter for server configuration
 2021-03-20 14:28:40 -06:00
silicons
6491615775 Merge pull request #14461 from Hatterhat/violent-cafe 
removes pacifism from ghost cafe
 2021-03-20 14:28:33 -06:00
silicons
a1c4323653 Merge pull request #14457 from GrayRachnid/holopads 
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
 2021-03-20 14:28:07 -06:00
silicons
77178c7664 Fix 2021-03-20 12:14:38 -07:00
silicons
d9a2316825 fix 2021-03-20 12:13:28 -07:00
Blue Wildrose
c02f35a7e5 Glowing goo be gone 2021-03-20 11:29:15 -07:00