shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,856 Commits 5 Branches 0 Tags
b2e176346c33afbefeb744b4e88198d1ea9fe3aa
Commit Graph

84 Commits

Author SHA1 Message Date
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
7b89ab66a2 Fixes reskinned guns being invisible (#1851) 2017-07-01 21:21:03 -07:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
LetterJay
00925de5f3 Update energy_gun.dm 2017-06-27 12:20:39 -05:00
LetterJay
77295c30d4 Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599 
[MIRROR] Disablers now have an in-hand sprite (Fixes #28582)
 2017-06-26 06:21:50 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
8809db8230 Disablers now have an in-hand sprite (Fixes #28582) 2017-06-20 10:31:24 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
CitadelStationBot
bb30963100 Fixes shooting self while suiciding with gun without proper firing pin auth (#1520) 2017-06-13 13:42:15 -07:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
CitadelStationBot
53229bb7da If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them 2017-06-11 08:30:29 -05:00
LetterJay
4624ec7e04 upstream-merge-27899 2017-06-11 00:09:55 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
LetterJay
b2d288d1f8 Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611 
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
 2017-06-05 23:06:18 -05:00
LetterJay
be38799933 cleanup 2017-06-05 22:39:51 -05:00
CitadelStationBot
4ac745a275 the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#1375) 2017-06-04 09:08:19 -07:00
CitadelStationBot
bfe11f8540 Fixes #27979 : Bulldog shotguns update properly when their magazine is removed. (#1377) 2017-06-04 09:07:36 -07:00
CitadelStationBot
c36e599a6a Fixes AOE modkits not working because I messed up the logic (#1400) 2017-06-04 09:03:45 -07:00
CitadelStationBot
cb755fc6d0 Adds three unique kinetic accelerator modules to necropolis chests 2017-06-01 15:32:16 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361 
[MIRROR]  Refactors explosions
 2017-05-30 15:15:51 -05:00
CitadelStationBot
e9d00c2aff [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191) 2017-05-27 13:36:44 -07:00
CitadelStationBot
c3d2dbe00a Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value 2017-05-27 09:27:00 -05:00
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJay
9befc09252 UAV online 2017-05-24 12:21:14 -05:00
LetterJay
c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -05:00
LetterJay
a9aa36e5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557 2017-05-24 12:13:44 -05:00
LetterJay
936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
CitadelStationBot
14427a2b8c Ballistic Weapon/Shotgun Reload Sounds 2017-05-24 05:52:37 -05:00
CitadelStationBot
ab7e9539bd Tactical Energy Gun Unique Sprites 2017-05-24 00:13:03 -05:00
LetterJay
2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427 
[MIRROR] Warden Compact Combat Shotgun
 2017-05-23 07:13:52 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
LetterJay
b66b362e4f Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484 
[MIRROR] KA Pressure Mods are now a traitor miner item
 2017-05-22 17:25:47 -05:00
LetterJay
9df8057e0e Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344 
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
 2017-05-22 12:40:18 -05:00
LetterJay
8791ad036f Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268 
[MIRROR] World.dm Refactor
 2017-05-22 12:39:52 -05:00
LetterJay
3548ed5e3e i'll fix this in another PR 2017-05-22 12:27:59 -05:00
CitadelStationBot
9e2d43fd80 KA Pressure Mods are now a traitor miner item 2017-05-22 08:20:07 -05:00
CitadelStationBot
8bc4cf3f41 Warden Compact Combat Shotgun 2017-05-21 22:29:01 -05:00
kevinz000
7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot
a3807448db Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076) 2017-05-21 17:42:06 -07:00
Poojawa
186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00