00da8a2ead
Merge pull request #3575 from deathride58/mapsyncs1
...
Map Syncs - TG-gnawed-on-too-many-cables Edition
2017-10-23 23:02:23 -04:00
6360be2041
Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
...
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
3243eaa6b8
Merge pull request #3573 from Citadel-Station-13/upstream-merge-32003
...
[MIRROR] fixes AIs being able to teleport the id card console inserted cards to their core
2017-10-23 16:54:57 -04:00
ad3bafcb42
Update motion.dm
2017-10-23 14:16:15 -05:00
9367eb23c5
Update iv_drip.dm
2017-10-23 14:15:20 -05:00
636ab7d156
Removes mob references from camera motion tracking
2017-10-23 13:32:32 -05:00
c1bd7bc6ba
Map syncs 1 - Code syncs
2017-10-23 12:56:26 -04:00
f4e0eab993
fixes AIs being able to teleport the id card console inserted cards to their core ( #32003 )
...
* Update card.dm
* Update card.dm
2017-10-23 08:59:24 -05:00
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
095839becf
Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969
...
[MIRROR] Gets rids of spawns in airlock code
2017-10-23 04:05:19 -04:00
8b4c183a26
Update lightswitch.dm
2017-10-22 10:55:52 -05:00
26d6e9e67b
Gets rids of spawns in airlock code ( #31969 )
...
* Gets rids of spawns in airlock code
* Update airlock.dm
2017-10-22 00:16:54 -05:00
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
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
46a78bc3dd
[MIRROR] Reverts bluespace pipes ( #3513 )
...
* Revert bluespace pipes while keeping fixes from the original PR (#31866 )
These are absurdely overpowered given that they have no research or
material gate
* Reverts bluespace pipes
2017-10-20 01:40:15 -05:00
72c8c8318d
Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819
...
[MIRROR] Fixes AI visiblity checks
2017-10-19 09:24:28 -04:00
b31d291ede
Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753
...
[MIRROR] Radiation makes you vomit blood and some more balance changes
2017-10-19 08:57:18 -04:00
d04818e6f9
Fixes AI visiblity checks ( #31819 )
2017-10-19 05:42:52 -05:00
45eeebd001
Sleeper nerfs ( #3478 )
2017-10-19 04:01:59 -05:00
04d26d561a
Radiation makes you vomit blood and more balance changes ( #31753 )
2017-10-18 09:25:11 -05:00
7f9d13ab42
[MIRROR] Removes 200mb of wasted memory usage ( #3472 )
...
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again
Removes 200mb of wasted memory usage
* Removes 200mb of wasted memory usage
2017-10-17 22:18:19 -05:00
db421c0f6b
Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972
...
[MIRROR] Atmospherics Multilayer Pipes
2017-10-17 08:58:10 -04:00
a41725a955
Atmospherics Multilayer Pipes ( #30972 )
...
* 1
* rpd
* 3
* 4
* 5
* 6
* 7
* 8
* wew
* src. and underlays
* update
* woops
* misspelled params
* reviews
* fixes
* fixes
* better checks and layer crap
* Update RPD.dm
* Update pipe_construction.dm
* 3 layers, fixes
* woops i didn't update defines correctly
* dunc
* Fixes
* Fixes
* fixes
* fixes some more bullshit
* fixes
* fixes
* not needed
* makes attachment sprites prettier or uglier i dunno
* Unary flag
* sprite fix??
* fixes...
* sprite fixes
2017-10-17 00:49:12 -05:00
af81a902fd
Fixes some copypasted airlocks referring to nonexistent overlay sprites ( #31741 )
2017-10-16 16:48:52 -05:00
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
499254761c
Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671
...
[MIRROR] ID ejecting from computers by alt-clicking
2017-10-15 10:22:04 -04:00
5bb7618aa9
Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers
...
ID ejecting from computers by alt-clicking
2017-10-14 18:48:13 -05:00
1831bc8ea9
Allows mobs to get shocked when they smash things ( #31677 )
...
also fixes an unrelated runtime involving magillitis
2017-10-14 15:19:37 -05:00
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
c442f49cde
Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645
...
[MIRROR] Cleans up explosives at syndie base
2017-10-14 10:20:27 -04:00
4b48651380
Merge pull request #3372 from Citadel-Station-13/upstream-merge-31646
...
[MIRROR] You can now drag-drop people into open DNA scanners
2017-10-14 10:20:11 -04:00
5bbf3b9735
Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620
...
[MIRROR] Fixes various Nanotrasen capitalizations
2017-10-14 10:19:15 -04:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
8aebc3b15a
Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
...
[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
c7afe4f70e
Cleans up explosives at syndie base ruin ( #31645 )
2017-10-13 16:29:36 -05:00
fdffebb3b8
You can now drag-drop people into open DNA scanners ( #31646 )
2017-10-13 16:28:24 -05:00
f63adc1931
Fixes various Nanotrasen capitalizations ( #31620 )
...
* Fixes capitalization of Nanotrasen for secsuits
gimme the GBP
* Fixes this one too
2017-10-13 12:13:26 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
1941a8fcfa
Merge pull request #31614 from AnturK/zap
...
Fixes electrocution animation
2017-10-13 09:14:45 -05:00
856b6ba853
Allows sillicons to use vending machines. ( #31541 )
...
* Allows borgs to use vending machines.
* Allows AI to use vending machines.
2017-10-12 00:29:43 -05:00
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
26800c1d1d
Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399
...
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
2017-10-10 05:54:08 -04:00
a6ac800db0
Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser ( #31399 )
...
* precision
* precision
* sanity checks
* itt kevinz doesn't know how cyberboss procs work
* fixes
* allows user cancellation
* im dumb
* itt: im still dumb
* fixes stuff, makes it set on init
* refactors reagentgrinder code
* more fixes, prevents melee attacks from going anyways
* ...? wtf is with usetopic
* Finally found out what's wrongw ith this thing.
* fixes a mistake
2017-10-10 03:11:50 -05:00
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
261df4f136
Merge pull request #3250 from Citadel-Station-13/upstream-merge-31387
...
[MIRROR] Adds a hacked autolathe subtype
2017-10-09 23:01:35 -04:00
9a49a512ee
Merge pull request #31387 from tgstation/Cyberboss-patch-3
...
Adds a hacked autolathe subtype
2017-10-09 13:39:42 -05:00
176642ba76
Stops airlocks from getting harddeleted, also fixes an unrelated runtime ( #31412 )
...
* Stops airlocks from getting harddeleted, also fixes an unrelated runtime
Destroying doors with a sniper rifle or anything that flat out destroys them good would runtime in doors.dm #L184.
Also doors would very often not get qdel'd properly, it was not 100% of the time but very common, this *seems* to fix it but since reproducing the bug was never quite certain, I'm not absolutely sure I got it. I did destroy all the doors on the station without triggering a harddel on a door after this fix, where previously it would happen.
* old friend ex_act
2017-10-09 08:56:16 -05:00
46180e36f3
Merge pull request #3227 from Citadel-Station-13/upstream-merge-31312
...
[MIRROR] Tweak to abandoned airlocks
2017-10-08 16:22:55 -04:00
LetterJay