shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,268 Commits 5 Branches 0 Tags
937f6356abc50ef3f3a467b3a022b17e1430d184
Commit Graph
29268 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ancientpower 937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
LinandGitHub 235ac2d27c Merge pull request #10815 from Putnam3145/locales-are-bad 
stop it with the unicode spam in the atmos defines
 2020-01-31 22:13:56 +00:00
Putnam e70dac7c54 stop it with the unicode spam 
god
 2020-01-31 13:35:17 -08:00
CitadelStationBot 54659185c7 Automatic changelog generation for PR #10790 [ci skip] 2020-01-31 11:03:43 -06:00
LinandGitHub 4ced8f62fa Merge pull request #10790 from Citadel-Station-13/Ghommie-patch-1 
A little load_character() fix: removing gender restrictions for undergarments/hair styles yet again.
 2020-01-31 17:03:40 +00:00
CitadelStationBot 9d1f897f29 Automatic changelog generation for PR #10782 [ci skip] 2020-01-31 10:58:50 -06:00
LinandGitHub ad4a4b3797 Merge pull request #10782 from Citadel-Station-13/kevinz000-patch-16 
nonlethal dueling pistols are now not access locked, lethal ones are now armory locked. also, dueling pistols show their duel datum id (which is added) for better finding when you have many pairs.
 2020-01-31 16:58:47 +00:00
CitadelStationBot 24336a7fc7 Automatic changelog generation for PR #10809 [ci skip] 2020-01-31 10:57:42 -06:00
GhomandGitHub b79793f688 Merge pull request #10809 from Arturlang/patch-6 
Fixes switchblade silvering
 2020-01-31 17:57:39 +01:00
ArturlangandGitHub d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
CitadelStationBot e142496ef5 Automatic changelog generation for PR #10795 [ci skip] 2020-01-30 21:39:30 -06:00
GhomandGitHub 0f4ea974c4 Merge pull request #10795 from ShadeAware/master 
FIXES THE SWITCHBLADE CRAFTING THING
 2020-01-31 04:39:27 +01:00
ShadeAwareandGitHub 5b43b2fac7 Update recipes_weapon_and_ammo.dm 2020-01-30 17:01:28 -05:00
CitadelStationBot 21b8f0515d Automatic changelog generation for PR #10768 [ci skip] 2020-01-30 15:46:43 -06:00
LinandGitHub 2b47d868ad Merge pull request #10768 from kevinz000/quick_thing 
moths can now chitter, and their laughs are now "unique"
 2020-01-30 21:46:41 +00:00
CitadelStationBot bb4016f13a Automatic changelog generation for PR #10644 [ci skip] 2020-01-30 14:30:58 -06:00
GhomandGitHub 15e5f0ef5d Merge pull request #10644 from ShadeAware/master 
Craftable Switchblades: The Finale
 2020-01-30 21:30:55 +01:00
GhomandGitHub d92a67f582 I'm sorry what? 2020-01-30 18:08:43 +01:00
GhomandGitHub 63560e191e A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles. 2020-01-30 18:03:58 +01:00
CitadelStationBot 55a0e4e55d Automatic changelog generation for PR #9860 [ci skip] 2020-01-29 21:15:26 -06:00
kevinz000andGitHub e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374 
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
 2020-01-29 20:15:22 -07:00
GhomandGitHub 1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
CitadelStationBot 0316a15142 Automatic changelog generation for PR #10746 [ci skip] 2020-01-29 21:01:19 -06:00
GhomandGitHub c96267eb06 Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9 
CAPTURE THE FLAG NOW HAS CLAYMORES
 2020-01-30 04:01:17 +01:00
GhomandGitHub 96e6e5903d Merge pull request #10783 from r4d6/fix 
AAAAAAH
 2020-01-30 04:00:07 +01:00
r4d6 cd048ebd77 AAAAAAH 2020-01-29 21:50:55 -05:00
GhomandGitHub 793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
GhomandGitHub 096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
GhomandGitHub b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00
kevinz000andGitHub 831fafb72b Update dueling.dm 2020-01-29 19:06:11 -07:00
kevinz000andGitHub 562659b5b8 Update dueling.dm 2020-01-29 19:00:11 -07:00
kevinz000andGitHub 0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf 
Removes stim packs from gangs
 2020-01-29 16:24:51 -07:00
CitadelStationBot c1b60db699 Automatic changelog generation for PR #10749 [ci skip] 2020-01-29 17:19:40 -06:00
GhomandGitHub f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01:00
CitadelStationBot 27019974f8 Automatic changelog generation for PR #10773 [ci skip] 2020-01-29 16:51:04 -06:00
kevinz000andGitHub cff69db1c3 Merge pull request #10773 from Putnam3145/whoops-gaseous 
Fixes to hypno toggle
 2020-01-29 15:51:01 -07:00
kevinz000andGitHub e3a3c8f241 woops 2020-01-29 15:45:57 -07:00
LinandGitHub cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 
demodularize and removes lot of unused clothing with missing sprites.
 2020-01-29 19:58:26 +00:00
LinandGitHub 15f36fab60 Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet 
Adds cosmic bedsheet to loadout for donator
 2020-01-29 19:43:01 +00:00
LinandGitHub 293e6576c8 Merge pull request #10564 from kevinz000/optimization_1 
Experimental optimizations
 2020-01-29 19:25:13 +00:00
GhomandGitHub 319973f2eb Merge pull request #10775 from r4d6/fix 
Fix HE Manifold Sprites, for good. [Speedmerge please]
 2020-01-29 19:01:57 +01:00
r4d6 c57dedd808 fix 2020-01-29 12:30:05 -05:00
Putnam 7626750c49 hypno tweaks 2020-01-28 23:03:29 -08:00
CitadelStationBot 6553aa634f Automatic changelog generation for PR #10295 [ci skip] 2020-01-28 22:34:52 -06:00
GhomandGitHub 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
CitadelStationBot cbd1fd2a67 Automatic changelog generation for PR #10761 [ci skip] 2020-01-28 22:31:21 -06:00
GhomandGitHub dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender 
Makes gender change potion not work on people with pref
 2020-01-29 05:31:18 +01:00
CitadelStationBot 31f24b8600 Automatic changelog generation for PR #10728 [ci skip] 2020-01-28 20:46:34 -06:00
GhomandGitHub bf97c2da3e Merge pull request #10728 from kevinz000/hugbox_meteor_time 
Meteor waves are now directional (and tell you the direction on the ""1 minute""+ warning)
 2020-01-29 03:46:32 +01:00
GhomandGitHub 44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00