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

5873 Commits

Author SHA1 Message Date
Putnam
68ad5c2e5c disposability 2021-03-30 23:56:12 -07:00
Lin
0f5d5522b0 Merge pull request #14431 from YakumoChen/ancient-bundle 
Ports Ancient bundle from TG
 2021-03-28 18:09:38 -05:00
silicons
2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff 
Allows borgs to move pulled stuff around like a human
 2021-03-28 13:48:14 -06:00
silicons
f269a8d35f Merge pull request #14274 from timothyteakettle/disguise 
lets ghost cafe residents disguise themselves as any mob or object
 2021-03-27 01:37:09 -06:00
silicons
3ffe980e35 Merge pull request #14486 from keronshb/radioactivemicroport 
patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures
 2021-03-27 01:36:19 -06:00
silicons
8a5d87725b Merge pull request #14515 from CuteMoff/Plasmaispogtake2 
Lets try again, Plasma Ingots (Fucked up the first time)
 2021-03-27 01:32:47 -06:00
silicons
bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix 
Shields: Changes, additional flags, bug fixes, sprites
 2021-03-27 01:31:55 -06:00
SandPoot
0994a37af5 upload files 2021-03-26 11:05:36 -03:00
necromanceranne
2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
necromanceranne
84223c65f5 Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields 2021-03-26 07:07:48 +11:00
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
keronshb
b06c15ab30 Update traitordevices.dm 
Fixed
 2021-03-24 21:32:31 -04:00
necromanceranne
79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11: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
a51a1ae68f Update mineral.dm 2021-03-23 21:24: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
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06: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
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
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
keronshb
0b5cedf893 patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures (#57380) 2021-03-20 20:40:51 -04: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
Lin
a9a5bdc61a Merge pull request #14471 from Citadel-Station-13/silicons-patch-9 
fixes being able to reach into closed bodybags (couldn't webedit 2 files in one PR without being not lazy)
 2021-03-19 21:08:39 -05:00
LetterN
150f6f4328 cbt 2021-03-19 20:11:26 +08:00
ItzGabby
ea1cf6797e I'm literally going to die with these checks 2021-03-19 02:59:30 -04:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
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
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
kiwedespars
5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00