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 |
|
CitadelStationBot
|
461804e635
|
Pulse Weapons Sprite Update
|
2017-05-19 13:51:47 -05:00 |
|
CitadelStationBot
|
c36eee94bd
|
Adds modified syringe guns
|
2017-05-19 06:25:23 -05:00 |
|
CitadelStationBot
|
a430e24555
|
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
|
2017-05-18 16:38:09 -05:00 |
|
CitadelStationBot
|
257cf986c5
|
Repaths C4 (#808)
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
|
2017-05-18 00:37:20 -05:00 |
|
LetterJay
|
52fa1f314f
|
Merge branch 'master' into upstream-merge-26760
|
2017-05-14 01:02:26 -04:00 |
|
CitadelStationBot
|
036109de58
|
Changes a bunch of hrefs to the proper defines
|
2017-05-02 02:20:07 -05:00 |
|
LetterJay
|
06bfa8770e
|
Merge branch 'master' into upstream-merge-26129
|
2017-04-29 11:45:37 -05:00 |
|
CitadelStationBot
|
caaf42815a
|
Changes some << to to_chat
|
2017-04-28 06:14:47 -05:00 |
|
CitadelStationBot
|
fd3fb360df
|
Changes the naming of an ammo to make it more distinct
|
2017-04-27 09:17:40 -05:00 |
|
CitadelStationBot
|
bde5d6253a
|
Unorphans the blackbox
|
2017-04-26 17:05:23 -05:00 |
|
CitadelStationBot
|
a905c15dad
|
Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
|
2017-04-26 08:18:35 -05:00 |
|
CitadelStationBot
|
d931e5801c
|
A bunch of Initialize()s now have return values
|
2017-04-25 03:51:57 -05:00 |
|
CitadelStationBot
|
19f06b5114
|
Fixes armlasers breaking on retract (#498)
|
2017-04-20 22:03:30 -05:00 |
|
CitadelStationBot
|
afdabc97ec
|
Fixes loading ammo for the L6-SAW (#496)
|
2017-04-20 22:02:26 -05:00 |
|