shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,348 Commits 5 Branches 0 Tags
4e7ebf7368599bfb0f538788e96b20a5be6564ef
Commit Graph

29348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
4e7ebf7368 Automatic changelog generation for PR #10744 [ci skip] 2020-02-01 12:11:13 -06:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines 
Moar engines!
 2020-02-01 19:11:10 +01:00
CitadelStationBot
4768c8f26e Automatic changelog generation for PR #10731 [ci skip] 2020-02-01 11:58:06 -06:00
Ghom
6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands 
Energy crossbow changed from RNG to static effects
 2020-02-01 18:58:03 +01:00
Ghom
d523cfd95e Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-02-01 18:54:18 +01:00
Ghom
74ad10355c Merge pull request #10805 from Citadel-Station-13/i-hate-dueling 
guns/ammo/projectiles now properly clean up while being deleted
 2020-02-01 18:52:47 +01:00
CitadelStationBot
5674e89eb5 Automatic changelog generation for PR #10352 [ci skip] 2020-02-01 11:46:13 -06:00
Ghom
3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
CitadelStationBot
91cea9fd5b Automatic changelog generation for PR #10800 [ci skip] 2020-02-01 11:44:32 -06:00
Ghom
a40d22fa45 Merge pull request #10800 from Seris02/moreslots 
fixes kevinz error with preferences.dm
 2020-02-01 18:44:29 +01:00
Ghom
051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization 
[READY]Ports TG updates to crafting and componentizes it
 2020-02-01 18:36:51 +01:00
CitadelStationBot
c9a1e106e8 Automatic changelog generation for PR #10808 [ci skip] 2020-02-01 11:23:00 -06:00
Ghom
45af9dc013 Merge pull request #10808 from Arturlang/macros_begone 
[READY] Ports chem dispenser macro recording
 2020-02-01 18:22:57 +01:00
CitadelStationBot
88b3b19a4f Automatic changelog generation for PR #10803 [ci skip] 2020-02-01 06:15:50 -06:00
Putnam3145
12f0c35660 Merge pull request #10803 from Seris02/highlightfix 
fixes the whitespace that gets created when you have highlighting strings on
 2020-02-01 04:15:47 -08:00
Putnam3145
17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9 
fixes a very likely race condition in dueling pistols
 2020-02-01 04:15:32 -08:00
CitadelStationBot
b5506115fd Automatic changelog generation for PR #10830 [ci skip] 2020-02-01 03:07:00 -06:00
Ghom
ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches 
[s] fixes a glitch with the PKA
 2020-02-01 10:06:58 +01:00
Seris02
3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Seris02
fc70b88b06 actually we only need it here 2020-02-01 11:51:15 +08:00
Seris02
20308b54dd exploit fix 2020-02-01 11:48:55 +08:00
necromanceranne
66862db7ab Last change to this, now the damage is respected by energy armor 2020-02-01 14:07:23 +11:00
CitadelStationBot
133da9bdef Automatic changelog generation for PR #10821 [ci skip] 2020-01-31 20:35:24 -06:00
Ghom
953c10c511 Merge pull request #10821 from ShadeAware/switchbladefix 
FIXES FANCY SWITCHBLADES
 2020-02-01 03:35:22 +01:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES 
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
 2020-01-31 21:12:08 -05:00
Artur
b4763d947e Kills macrotier 2020-02-01 03:03:55 +01:00
CitadelStationBot
4d1f0144ef Automatic changelog generation for PR #10781 [ci skip] 2020-01-31 18:49:02 -06:00
Ghom
c9e315a9e6 Merge pull request #10781 from r4d6/RPD 
RPD icon reorder, less building pixelhunting
 2020-02-01 01:48:59 +01:00
CitadelStationBot
c982369910 Automatic changelog generation for PR #10559 [ci skip] 2020-01-31 18:46:18 -06:00
Ghom
5257ab2e00 Merge pull request #10559 from Seris02/custompie 
custom reagent pie smite
 2020-02-01 01:46:15 +01:00
CitadelStationBot
f5aa5f50f9 Automatic changelog generation for PR #10776 [ci skip] 2020-01-31 18:44:57 -06:00
Ghom
7fdabe81ab Merge pull request #10776 from Hatterhat/hecksuitgolres 
heck suit resistances - goliath resistance and also acid-proof
 2020-02-01 01:44:54 +01:00
CitadelStationBot
bf4e07cc75 Automatic changelog generation for PR #10777 [ci skip] 2020-01-31 18:44:22 -06:00
Ghom
fddd79b466 Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4 
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
 2020-02-01 01:44:19 +01:00
CitadelStationBot
d292b102b3 Automatic changelog generation for PR #10786 [ci skip] 2020-01-31 18:42:58 -06:00
Ghom
327bfcac2f Merge pull request #10786 from Commandersand/frick 
made the centcomm suit syndies order be a variant with no sensors
 2020-02-01 01:42:55 +01:00
Ghom
0925dc55c2 Merge pull request #10789 from Putnam3145/whoops-text 
Minor typo fix
 2020-02-01 01:42:08 +01:00
CitadelStationBot
396d712857 Automatic changelog generation for PR #10793 [ci skip] 2020-01-31 18:41:39 -06:00
Ghom
1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix 
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
 2020-02-01 01:41:36 +01:00
Lin
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
Artur
880e8c3e04 Whoopsie 2020-01-31 22:34:01 +01:00
Artur
dd1083e7da How did i fuck up this bad 2020-01-31 18:32:12 +01:00
Artur
d0b03877ea Should be right now 2020-01-31 18:24:49 +01:00
Artur
bcb2bfca02 Why did tg remove this 2020-01-31 18:21:00 +01:00
Artur
8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00
CitadelStationBot
54659185c7 Automatic changelog generation for PR #10790 [ci skip] 2020-01-31 11:03:43 -06:00
Lin
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
Lin
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