LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
kevinz000
fcddd32703
Merge pull request #2195
2017-08-29 22:26:58 -07:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
064ade469f
sync
2017-08-29 09:35:55 -07:00
kevinz000
498bd61928
sync
2017-08-29 09:12:56 -07:00
CitadelStationBot
3fe08c3cc7
Prevents medbeams from crossing themselves
2017-08-29 09:50:47 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -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
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
CitadelStationBot
edf7c03070
Multiple inhand sprites fix
2017-07-30 19:58:18 -05:00
CitadelStationBot
3f8acbc2c4
Removes bows ( #2163 )
2017-07-28 02:53:47 -07:00
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
