oranges
033f336ed1
Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray
...
Xrays go through walls but stop on mobs/blob
2017-11-13 03:17:24 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
nicbn
46c62b6293
overhaul ( #32316 )
2017-11-03 23:40:27 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
LetterJay
3202baec26
Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075
...
[MIRROR] Makes staff of change randomly assign a borg module
2017-10-27 02:17:45 -04:00
ShizCalev
6fc3da14d4
Makes staff of change randomly assign a borg module
2017-10-25 23:39:48 -05:00
ShizCalev
7c34440a06
Fixes braindead aliums
2017-10-25 23:32:33 -05:00
Cruix
d48cea337b
Fixed projectile runtimes ( #31973 )
2017-10-21 07:19:28 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
2dfbdaff30
[MIRROR] fixes being unable to hit people next to you if you're dragging them and moving ( #3517 )
...
* Update projectile.dm (#31893 )
* fixes being unable to hit people next to you if you're dragging them and moving
2017-10-21 06:15:37 -05:00
CitadelStationBot
5abe26c765
[MIRROR] fixes gibtonite instant hitting , projectile double hitting - not entirely my fault ( #3526 )
...
* fixes gibtonite instant hitting , projectile double hitting - not entirely my fault (#31891 )
* Update projectile.dm
* Update projectile.dm
* Update projectile.dm
* fixes gibtonite instant hitting , projectile double hitting - not entirely my fault
2017-10-21 06:11:28 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
92fa0ca960
Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809
...
[MIRROR] Cleans up some istypes not using helpers
2017-10-18 07:37:43 -04:00
Leo
28656d3347
Merge pull request #31809 from ShizCalev/helper-cleanup
...
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
Leo
a9389f4099
Merge pull request #31800 from DaxDupont/500hours
...
Fixes automatic fire on guns
2017-10-17 09:19:42 -05:00
kevinz000
87b84cedf0
Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities ( #31660 )
...
* Update projectile.dm
* fixes projectiles
2017-10-17 03:51:10 -05:00
LetterJay
3c0c5db5d9
Update beam_rifle.dm
2017-10-16 06:14:24 -05:00
LetterJay
ee70d961d7
Update firing.dm
2017-10-16 06:13:51 -05:00
kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
Jordan Brown
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
LetterJay
45619b0e1b
Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
...
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
nicbn
921b65ced0
Bullet decals tweak ( #31420 )
...
* wee
* screen clock update
* resist and stop pulling
* Whoop, Joan messed up on the selection border so here's some fixed icons for that
* there we go
* Update walls.dm
* Update walls.dm
* Update walls.dm
2017-10-13 09:47:10 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
LetterJay
9d7877cd02
Merge pull request #3277 from Citadel-Station-13/upstream-merge-31012
...
[MIRROR] Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities.
2017-10-10 05:56:18 -04:00
GLACoding
9050cc63ca
Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities. ( #31012 )
...
* Projectile code additions
* Adds !prehit checks and corrects the check for energy cannon spam
* Adds checks for machines and structures to stop double hitting
* JJRcop Requesting Fixes #1
* JJRcop Requested Fixes #2
* Fixes projectiles unable to hit mobs in machines
* Adds in a new proc select_target, and rewrites some bits
Fixes projectiles double hitting when targetting machines with mobs on them, also makes it so weapons with forcedodge can hit targets inside walls.
* AnturK requested fix #1
2017-10-10 03:28:33 -05:00
Tad Hardesty
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
FrozenGuy5
3e6fcaec28
Fixes c20r damage ( #31425 )
...
* Fixes c20r damage
* minor pointless documentation
2017-10-08 15:36:04 -05:00
LetterJay
a35b84cc2e
Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
...
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
jughu
466a6806e1
Allows shotgun darts to cause reagent reactions ( #31337 )
2017-10-07 00:18:04 -05:00
The-clown-known-as-Pepe
13eedff767
Fixes rubber shot after unintended nerf. ( #31316 )
...
* Update bullets.dm
* fix
* refactor
* Update ammo_casings.dm
2017-10-05 17:48:37 -05:00
LetterJay
c2fe00cebd
Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264
...
[MIRROR] Preliminary blast cannon cleanup
2017-10-04 18:44:38 -04:00
LetterJay
4610a7a61d
Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180
...
[MIRROR] removes carp piggyback exploit
2017-10-04 18:43:31 -04:00
LetterJay
e6ccc7077a
Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279
...
[MIRROR] why plus a minus value and not just minus the value...
2017-10-04 18:43:04 -04:00
kevinz000
d9d08ed57f
Preliminary blast cannon cleanup ( #31264 )
...
* Update blastcannon.dm
* Update blastcannon.dm
* Update blastcannon.dm
2017-10-04 16:32:41 -05:00
kevinz000
9e59a29e35
Update projectile.dm ( #31180 )
2017-10-04 14:51:16 -05:00
kevinz000
1a3fc9f1c6
why plus a minus value and not just minus the value... ( #31279 )
...
* Update bullets.dm
* Update visuals_icons.dm
* Update asteroid.dm
2017-10-04 14:03:20 -05:00
Supermichael777
d69c6615a8
Fixes stealth nerf to detectives gun ( #31125 )
...
* Fixes stealthnerf to detectives gun
Having knockdown healed stamina damage, but also needed stamina too keep you down. This rectifies the extra stamina healing
* WEW LADS
2017-10-03 18:14:01 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
LetterJay
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
LetterJay
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
LetterJay
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
ShizCalev
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
