shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,093 Commits 5 Branches 0 Tags
1ef3f45f89792e262fa968d761db97eb3ff81853
Commit Graph

19373 Commits

Author SHA1 Message Date
kevinz000
c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00
kevinz000
5b01691834 Merge pull request #11005 from Arturlang/Hypospray_fix 
Moves the hypospray mode change to CTRL click
 2020-02-12 23:57:50 -07:00
kevinz000
4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567 
Something about missing privates sprites and bad code.
 2020-02-12 23:56:53 -07:00
kevinz000
4f9652f2d2 Merge pull request #11029 from Putnam3145/fix-that-dumb 
Made the fallback if config is incorrect for map voting plurality (default)
 2020-02-12 21:01:07 -07:00
Ghom
942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix 
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
 2020-02-12 16:51:38 +01:00
Ghom
2674fa6efc Merge pull request #11043 from Seris02/apcthingfix 
fixes apc icons
 2020-02-12 15:35:01 +01:00
Seris02
eb5835f668 fixes apcs 2020-02-12 21:35:51 +08:00
Ghom
8c2801fda6 Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4 
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
 2020-02-12 11:14:27 +01:00
Ghom
af477aa28b Merge pull request #10992 from Hatterhat/buckbuff 
buckshot buff - 60 to 75 on all pellet pointblank
 2020-02-12 10:34:25 +01:00
Ghom
0917617543 Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2 
improves getImplant by using locate()
 2020-02-12 10:33:08 +01:00
Ghom
ce5208a1df Merge pull request #11007 from r4d6/random-fixes 
Mining Shuttle Fix
 2020-02-12 10:10:16 +01:00
Ghom
fc3f0d02fc Merge pull request #11032 from Citadel-Station-13/kevinz000-patch-7 
Fixes cryotubes not transferring reagents for minutes at a time (because at tier 4 it takes 80 * 20 = 1600 deciseconds (!!!) to .. transfer regeants??)
 2020-02-12 09:09:36 +01:00
Ghom
2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port 
Ports /vg/station drink sliding
 2020-02-12 09:06:03 +01:00
kevinz000
ecbb7767c3 Update cryo.dm 2020-02-11 23:07:47 -07:00
Putnam
7795e1609d why did i do that 2020-02-11 15:32:43 -08:00
Ghom
ac64f6574c Merge pull request #11003 from kevinz000/meme_rifles 
Fixes energy lens not being in gun contents
 2020-02-11 16:11:11 +01:00
kevinz000
f247c6d8c6 Update pai_defense.dm 2020-02-11 04:27:22 -07:00
Artur
ce2ab532d9 Maintainer suggestion 2020-02-11 11:23:56 +02:00
kevinz000
58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561 
Adds the ELEMENT_DETACH flag to two elements
 2020-02-11 00:42:15 -07:00
Hatterhat
1d071ff127 one off 2020-02-10 21:40:51 -06:00
keronshb
42fda3d88b CogChamp 
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
 2020-02-10 21:18:51 -05:00
Lin
4797b5edc8 Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1 
Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
 2020-02-10 20:28:57 +00:00
Lin
f1f8123e5a Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5 
CallMaterialName reagent fix
 2020-02-10 20:27:38 +00:00
Lin
4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566 
something about suit_digi.dmi
 2020-02-10 20:24:35 +00:00
r4d6
dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
Artur
af95921155 Goddamnit 2020-02-10 15:20:22 +01:00
kevinz000
520dd57bf9 Update mob_helpers.dm 2020-02-10 04:33:27 -07:00
Ghom
c8a62e7acf Merge pull request #10985 from r4d6/Dwarf 
Dwarven Update
 2020-02-10 12:23:23 +01:00
Ghom
3ee4f25626 Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes 
Pandemic Fixes
 2020-02-10 12:22:40 +01:00
Ghom
a0666e7454 Merge pull request #11000 from Seris02/rcdfixyeet 
makes RCDs not cost a single sheet of glass and metal
 2020-02-10 12:20:40 +01:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup 
Hijack Implant
 2020-02-10 04:16:14 -07:00
kevinz000
79146bce9b Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3 
Fixes AI unanchoring not properly removing the no teleport trait.
 2020-02-10 04:15:29 -07:00
kevinz000
c9e5fd1c17 Merge pull request #10988 from YakumoChen/master 
Reverts 10486 (Observe verb in the Ghost tab)
 2020-02-10 04:14:33 -07:00
kevinz000
5d2b2d7fbf Merge pull request #10971 from Trilbyspaceclone/disco_baby 
Adds more Alien disco
 2020-02-10 04:14:18 -07:00
kevinz000
4416d9de46 Merge pull request #10965 from Citadel-Station-13/Ghommie-patch-2 
Fixing the mob holder element
 2020-02-10 04:11:51 -07:00
kevinz000
c3eaa0fcbd Merge pull request #10948 from Citadel-Station-13/Ghommie-patch-1 
Prevents certain unpurchasable discounts.
 2020-02-10 04:11:35 -07:00
kevinz000
88fa342c26 Merge pull request #10976 from Ghommie/Ghommie-cit565 
fixing another issue with the hear component signal.
 2020-02-10 04:09:19 -07:00
kevinz000
45bec21520 fix sync 2020-02-10 04:01:21 -07:00
Artur
816f94bd61 pandemic fixes 2020-02-10 10:20:57 +02:00
Seris02
e6aa47997c fix rcd cost 2020-02-10 16:00:21 +08:00
Ghom
0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
Ghom
bd5f2bd64d Update reinf_walls.dm 2020-02-10 07:41:36 +01:00
keronshb
023d49a207 30 removal 
Here it is
 2020-02-09 23:44:34 -05:00
Ghom
96a240bc11 Merge pull request #10984 from Trilbyspaceclone/patch-277 
Makes heads of staff no longer come to work as a gang leader
 2020-02-10 03:51:49 +01:00
DeltaFire
55a5686c01 No more Narsie runes in half the time or less 
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
 2020-02-10 02:46:54 +01:00
Hatterhat
d24afcde1b pb burst from 60 to 81 2020-02-09 19:07:24 -06:00
keronshb
1492586f76 Fixes round 3? 4? 
Should fix the last round of requests?
 2020-02-09 18:18:55 -05:00
Ghom
33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange 
Nerfing Stimulants
 2020-02-09 23:56:52 +01:00
keronshb
60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05:00
Ghom
c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates 
Updates the debug outfit
 2020-02-09 22:49:22 +01:00