LetterJay
1d040d46d1
Merge pull request #2701 from Citadel-Station-13/upstream-merge-30564
...
[MIRROR] Spetsnaz Pyro Bundle Rebalance
2017-09-12 19:17:23 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
BeeSting12
9e83717c92
Spetsnaz Pyro Bundle Rebalance ( #30564 )
...
* im gay
* oops did a thing wrong
* wew
2017-09-11 12:32:58 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
Kerbin-Fiber
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
cf46abecb3
Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
...
[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -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
f45f5bbf3d
quadruple wew
2017-08-29 10:02:18 -07: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
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -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
41b0f9f9d4
Gorillas
2017-08-20 19:56:21 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
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
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
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
