shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,094 Commits 5 Branches 0 Tags
e4a20a16a445d546e29fa98d486aff3d0e68b024
Commit Graph
30094 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GhomandGitHub e4a20a16a4 Update genitals.dm 2020-02-13 08:25:44 +01:00
GhomandGitHub 1ef3f45f89 Update genitals.dm 2020-02-13 08:22:08 +01:00
GhomandGitHub d9885cf278 oh damn, forgot those are numbers 2020-02-13 08:16:37 +01:00
CitadelStationBot 358fe3d2e0 Automatic changelog generation for PR #10943 [ci skip] 2020-02-13 01:05:04 -06:00
kevinz000andGitHub 79f253e042 Merge pull request #10943 from Ghommie/Ghommie-cit562 
Fixing an oversight with genital/Remove() and cleaning the code a little.
 2020-02-13 00:05:01 -07:00
GhomandGitHub ee10c03630 Merge branch 'master' into Ghommie-cit562 2020-02-13 08:00:53 +01:00
CitadelStationBot f0f043db49 Automatic changelog generation for PR #11012 [ci skip] 2020-02-13 00:58:16 -06:00
kevinz000andGitHub c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00
CitadelStationBot ed6c35f170 Automatic changelog generation for PR #11005 [ci skip] 2020-02-13 00:57:53 -06:00
kevinz000andGitHub 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
CitadelStationBot ca7134ca92 Automatic changelog generation for PR #10987 [ci skip] 2020-02-13 00:56:55 -06:00
kevinz000andGitHub 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
CitadelStationBot b682f9e730 Automatic changelog generation for PR #11029 [ci skip] 2020-02-12 22:01:10 -06:00
kevinz000andGitHub 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
CitadelStationBot 89936a1335 Automatic changelog generation for PR #10994 [ci skip] 2020-02-12 09:51:41 -06:00
GhomandGitHub 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
CitadelStationBot f89d3907e9 Automatic changelog generation for PR #11043 [ci skip] 2020-02-12 08:35:05 -06:00
GhomandGitHub 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
CitadelStationBot 88f063623e Automatic changelog generation for PR #11020 [ci skip] 2020-02-12 05:47:35 -06:00
GhomandGitHub 31c7a0e2be Merge pull request #11020 from Zellular/Animations1 
Movement animations for the pupdozer
 2020-02-12 12:47:32 +01:00
CitadelStationBot a7e24c33c2 Automatic changelog generation for PR #11018 [ci skip] 2020-02-12 04:14:30 -06:00
GhomandGitHub 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
CitadelStationBot 40ab7b45df Automatic changelog generation for PR #10992 [ci skip] 2020-02-12 03:34:28 -06:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub ce5208a1df Merge pull request #11007 from r4d6/random-fixes 
Mining Shuttle Fix
 2020-02-12 10:10:16 +01:00
CitadelStationBot 9997cb4f75 Automatic changelog generation for PR #11032 [ci skip] 2020-02-12 02:09:39 -06:00
GhomandGitHub 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
CitadelStationBot 199df8bec0 Automatic changelog generation for PR #10861 [ci skip] 2020-02-12 02:06:06 -06:00
GhomandGitHub 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port 
Ports /vg/station drink sliding
 2020-02-12 09:06:03 +01:00
kevinz000andGitHub 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
Zellular 64ab4353fb Revert "Revert "Pupdozer animations"" 
This reverts commit a642bf9705.
 2020-02-11 08:34:11 -08:00
CitadelStationBot 60756cbc35 Automatic changelog generation for PR #11003 [ci skip] 2020-02-11 09:11:14 -06:00
GhomandGitHub 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
Zellular a642bf9705 Revert "Pupdozer animations" 
This reverts commit 8fbcdde9e8.
 2020-02-11 04:29:45 -08:00
Zellular 8fbcdde9e8 Pupdozer animations 
Adds movement states for the pupdozer dogborg module.
 2020-02-11 03:49:56 -08:00
kevinz000andGitHub 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
CitadelStationBot d05624dbec Automatic changelog generation for PR #10996 [ci skip] 2020-02-11 02:34:07 -06:00
GhomandGitHub 5726f041a8 Merge pull request #10996 from PersianXerxes/gulagChanges 
Separates gulag and public mining, removes sec vendor from gulag
 2020-02-11 09:34:04 +01:00
kevinz000andGitHub 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
CitadelStationBot 5e342a6f56 Automatic changelog generation for PR #10961 [ci skip] 2020-02-10 14:29:00 -06:00
LinandGitHub 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
CitadelStationBot 2d9e1d2ea3 Automatic changelog generation for PR #10989 [ci skip] 2020-02-10 14:27:41 -06:00
LinandGitHub f1f8123e5a Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5 
CallMaterialName reagent fix
 2020-02-10 20:27:38 +00:00
LinandGitHub 4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566 
something about suit_digi.dmi
 2020-02-10 20:24:35 +00:00