Commit Graph

141 Commits

Author SHA1 Message Date
CitadelStationBot
e5b7eefffe Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration. 2017-08-16 17:53:39 -05:00
LetterJay
e5cd79a14e Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
[MIRROR] Moved can_trigger_gun to item/weapon parent
2017-08-14 18:53:38 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
CitadelStationBot
97243fca3a Moved can_trigger_gun to item/weapon parent 2017-08-14 16:05:43 -05:00
CitadelStationBot
d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
2017-08-03 06:12:27 -07:00
CitadelStationBot
1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214)
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
ktccd
445fb5a395 Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412
[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
2017-07-31 21:59:10 +02:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
CitadelStationBot
b953db165d Colossus's shotgun is now a static-spread blast of 6 bolts 2017-07-30 19:58:21 -05:00
CitadelStationBot
3f8acbc2c4 Removes bows (#2163) 2017-07-28 02:53:47 -07:00
CitadelStationBot
cc9330a2ec Fixes guns staying zoomed in after being unequipped 2017-07-26 15:44:54 -05:00
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
faf5b1dd73 Projectiles with non-angled sprites will no longer uselessly create and set a matrix (#2114) 2017-07-24 04:06:08 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -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
a4d968ec82 Fixes missiles being able to ricochet 2017-07-15 22:31:05 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018)
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
2017-07-15 13:17:56 -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
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot
5dd25bda95 Minor Projectile Reflection Refactor (#1926) 2017-07-07 10:33:59 -07:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05: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
CitadelStationBot
06e536de4f Fixes piggybacking giving person on top projectile density instead of the person on the bottom. 2017-06-26 09:01:53 -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
80be7ee88a Merge pull request #1455 from Citadel-Station-13/upstream-merge-28125
[MIRROR] I might HAVE accidently made dualwielding hilariously OP again so have a nerf!
2017-06-14 08:53:52 -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
CitadelStationBot
1ef233d304 I might HAVE accidently made dualwielding hilariously OP again so have a nerf! 2017-06-07 09:14:59 -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