shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,894 Commits 5 Branches 0 Tags
caceb02dc303be0cb3addf625f3069c646fa03e8
Commit Graph

2345 Commits

Author SHA1 Message Date
kevinz000
997e975e1d Merge pull request #8170 from Trilbyspaceclone/Borgo 
Maybe adds adv health scanner to all borgs that have health scanners
 2019-04-02 05:37:22 -07:00
kevinz000
ebdd1ecce5 Merge pull request #8173 from Trilbyspaceclone/2.0Defibs 
Defib upgrade tech
 2019-04-02 05:35:04 -07:00
kevinz000
fc7e67ebcb Merge pull request #8183 from Seris02/master 
adds bluespace bio bags
 2019-04-02 05:34:27 -07:00
deathride58
aa38960ab6 Update code/game/objects/items/storage/bags.dm 
Co-Authored-By: Seris02 <49109742+Seris02@users.noreply.github.com>
 2019-04-01 11:01:26 +08:00
Seris02
c91fd98fb0 adds bluespace bio bags 2019-03-31 15:13:01 +08:00
Zandario
7877cadcad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into zandario-sound-overhaul 2019-03-29 14:28:31 -05:00
Zandario
30ff894398 Adds PDA Sounds 
Adds new sound files and gives the PDA life!
 2019-03-29 14:18:34 -05:00
Trilbyspaceclone
09c6abd19c maybe 2019-03-27 15:19:47 -04:00
Trilbyspaceclone
1bf175a3c0 Hmm 2019-03-26 13:19:02 -04:00
Trilbyspaceclone
9731aef9bb Cant count Lilly 2019-03-26 13:13:22 -04:00
Trilbyspaceclone
52003b20f4 >_< 2019-03-26 13:06:53 -04:00
Trilbyspaceclone
823299acb9 Not as broken code as I thought 2019-03-25 17:05:36 -04:00
Trilbyspaceclone
da949a597f Maybe! 2019-03-25 16:32:02 -04:00
nik707
af0b92cb84 Merge pull request #8154 from Citadel-Station-13/kevinz000-patch-27 
fixes forcefield exploit
 2019-03-22 18:21:37 -05:00
nik707
b3776a2e3c Merge pull request #8155 from Citadel-Station-13/kevinz000-patch-29 
forcefields can no longer be stacked
 2019-03-22 18:21:24 -05:00
kevinz000
f9aa4f8f82 Update forcefieldprojector.dm 2019-03-20 21:41:05 -07:00
kevinz000
bd86f659c9 Update forcefieldprojector.dm 2019-03-20 19:24:42 -07:00
kevinz000
b20e45d3b7 Update forcefieldprojector.dm 2019-03-20 19:22:25 -07:00
Trilbyspaceclone
830bfff180 Update PDA_types.dm 2019-03-18 17:45:26 -04:00
Trilbyspaceclone
026bf39929 NYA~ 2019-03-18 17:31:03 -04:00
deathride58
36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 2019-03-15 16:49:10 -04:00
deathride58
d9df0c1f76 Merge pull request #8093 from Trilbyspaceclone/patch-74 
[Ready] Makes Fire extinguisher slip need a screwdriver - Frack & Spensara Request Middle ground by Bhijn
 2019-03-08 20:54:21 -05:00
deathride58
aac192752f Merge pull request #8088 from Trilbyspaceclone/patch-69 
[MIRROR] - Candle cleanup and fixes #42968
 2019-03-08 20:50:13 -05:00
deathride58
df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD 
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
 2019-03-08 20:46:19 -05:00
Trilbyspaceclone
bda18c0770 Update extinguisher.dm 2019-03-06 20:32:40 -05:00
Trilbyspaceclone
7c79484784 Update extinguisher.dm 2019-03-06 20:05:53 -05:00
Trilbyspaceclone
fdad1c30be ? 2019-03-06 17:05:54 -05:00
Trilbyspaceclone
371a4a1a9e Maybe 2019-03-06 16:45:47 -05:00
Trilbyspaceclone
8a5b4414a3 Update extinguisher.dm 2019-03-05 16:37:22 -05:00
Trilbyspaceclone
1228bb4b11 Update extinguisher.dm 2019-03-05 15:37:27 -05:00
Trilbyspaceclone
a0b38d0ed7 Update extinguisher.dm 2019-03-05 03:34:38 -05:00
Trilbyspaceclone
8f02bf0357 Oh I did a goof 2019-03-05 00:33:53 -05:00
Trilbyspaceclone
eb80b6f6cd ? 2019-03-05 00:29:20 -05:00
Trilbyspaceclone
c6011bb853 Update extinguisher.dm 2019-03-04 23:35:25 -05:00
Trilbyspaceclone
5f764b7d1b Update candle.dm 2019-03-04 20:33:53 -05:00
Trilbyspaceclone
06174f77a5 Update lattice.dm 2019-03-04 16:31:40 -05:00
kevinz000
2bd991042c Merge pull request #8051 from deathride58/gitgudscrub 
Reduces the pixel variance of thrown objects by four pixels and attempts to fix bartender glasses tilting uncontrollably
 2019-03-01 02:27:55 -08:00
kevinz000
21d6412104 Merge pull request #8050 from TrojanCoyote/master 
Adding a plush
 2019-03-01 02:24:38 -08:00
Nope
15bd91ecd9 Update plushes.dm 2019-02-27 18:22:25 -06:00
kevinz000
bdffc9e10c Merge pull request #8003 from Trilbyspaceclone/morefamstuff 
More heirloom stuff for Lawyer, Cap and Chap
 2019-02-27 16:18:25 -08:00
kevinz000
317dc309a0 Merge pull request #8024 from deathride58/bloodybloodbloodblood 
Atomizes the med rework's blood effect changes (most things that make a blood effect will now make you actually lose blood) and makes the blood reagent act more like you'd expect
 2019-02-27 16:03:56 -08:00
deathride58
a205177ff5 Reduces the pixel variance of thrown objects and tries to fix the bug where bartender glasses are rotated 2019-02-26 21:11:50 -05:00
Nope
aaeedd1ffa Adding a plush 
burgit fuckin add this reeeeeee /obtuse/
 2019-02-26 18:55:08 -06:00
deathride58
e74f5bad3f Merge pull request #8020 from Citadel-Station-13/kevinz000-patch-27 
[s] grenade logging improvement
 2019-02-22 13:04:03 -05:00
kevinz000
0d43cac0e6 Update grenade.dm 2019-02-22 06:02:55 -08:00
nik707
788b97def5 Merge pull request #8019 from Thalpy/FermiChem 
Fermi chem creates a plushie
 2019-02-22 02:41:42 -06:00
deathride58
59a982466f Merge pull request #8022 from BlackMajor/master 
Plushtide 2: Electric Boogaloo
 2019-02-20 19:21:34 -05:00
deathride58
e2ae4181f4 Merge pull request #7993 from MediHound/dogborg-upgrades-rework-v01 
Cyborg upgrades rework v01
 2019-02-20 19:19:20 -05:00
deathride58
c11aba9368 oh, right. i've gotta add a snowflake check since /living lacks bleed() in the base code 2019-02-20 03:37:07 -05:00
BlackMajor
1ff058ac50 Whoops 2019-02-20 21:27:31 +13:00