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

5947 Commits

Author SHA1 Message Date
LetterN
2c2e779aa6 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-19 10:28:43 +08:00
silicons
1f58e1823e Update bodybag.dm 2021-03-18 17:00:16 -07:00
silicons
d434f60cb3 Update closets.dm 2021-03-18 16:59:03 -07:00
silicons
8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal 
Locks Bluespace Jars to be admin-only
 2021-03-18 06:41:38 -06:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real 
[HERETICS] Void & a handful of heretics-related PRS
 2021-03-18 06:38:40 -06:00
Hatterhat
dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
GrayRachnid
b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04:00
DeltaFire
45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints 
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
 2021-03-17 17:01:47 +01:00
LetterN
69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452 
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
 2021-03-17 11:49:50 +08:00
YakumoChen
3aca657c1f Update uplink_kits.dm 2021-03-16 22:03:49 -04:00
YakumoChen
5f30c71321 Update uplink_kits.dm 2021-03-16 22:00:44 -04:00
LetterN
228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00
YakumoChen
757e7b34d7 Update code/game/objects/items/storage/uplink_kits.dm 
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
 2021-03-16 00:57:56 +00:00
DeltaFire
2d43fd06e8 qdel 2021-03-15 23:14:29 +01:00
DeltaFire
f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
necromanceranne
1de69e0dec uuuuh if you say so boss 2021-03-16 06:14:49 +11:00
necromanceranne
832fb7a6f8 oops, this should fix that failed check...I hope 2021-03-16 06:03:22 +11:00
necromanceranne
29a28d4ed8 keeps knockdown on rng throw, because you deserve it if you land it 2021-03-16 05:52:38 +11:00
necromanceranne
6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
silicons
5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5 
post-hardsync1.5
 2021-03-14 23:30:26 -06:00
kiwedespars
69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
YakumoChen
8484f2f120 adds ancient kit 2021-03-13 03:36:54 +00:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
kiwedespars
5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00
Lin
521570793f Merge pull request #14392 from R3dtail/patch-4 
Readability/Grammar alteration
 2021-03-10 18:34:47 -06:00
Hatterhat
d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
silicons
18fdd0c6cf Merge pull request #14337 from kiwedespars/we-hate-cqc 
nerfs cqc (probably)
 2021-03-10 01:32:14 -07:00
Letter N
59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
R3dtail
25651e9144 Readability/Grammar alteration 2021-03-09 14:38:24 -06:00
kiwedespars
3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
silicons
58b69786c8 Merge pull request #14358 from Hatterhat/femur-breakies 
femur breaker actually breaks legs any%
 2021-03-09 00:18:41 -07:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons
21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket 
MWS-01 Changes
 2021-03-06 16:59:46 -07:00
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
DeltaFire
357853863e Merge pull request #14352 from timothyteakettle/jar-nerf 
exiting a bluespace jar through any means, hardstuns you for 5 seconds
 2021-03-06 03:50:35 +01:00
Letter N
c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
Letter N
34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Putnam3145
43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak 
Removes Superconuctivity from Reinforced Plasma Glass
 2021-03-04 09:33:45 -08:00
Letter N
45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N
7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Hatterhat
9b2d62b9ef whoops again 2021-03-02 22:09:38 -06:00
Hatterhat
dc5ca7a556 oops 2021-03-02 22:07:13 -06:00
Hatterhat
053f9ea857 any% 2021-03-02 22:06:57 -06:00
keronshb
b105556603 No Superconductivity with Reinforced Plasma Glass 
Removes heat going through RPlasma Glass
 2021-03-02 21:45:36 -05:00
silicons
824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix 
[FIX] More pacifism bug squashing
 2021-03-02 16:57:26 -07:00
timothyteakettle
f0d219e999 Update pet_carrier.dm 2021-03-02 14:26:53 +00:00
timothyteakettle
a5c17eead4 Update pet_carrier.dm 2021-03-02 14:25:44 +00:00