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
04006b2ad2
Tweak to abandoned airlock ( #31312 )
2017-10-08 10:09:03 -05:00
eabe7f67f5
Update constructable_frame.dm
2017-10-07 22:49:19 -05:00
68fa18f489
Update PDApainter.dm
2017-10-07 22:48:55 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
f45344ed8c
Adds wigs
2017-10-05 09:23:56 -05:00
67f0c2f41c
Fixes mech fab runtime ( #31232 )
...
* Dunno what the initial was about, it's a list.
* Proper fixup
* Typo
2017-10-03 18:19:40 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
6268682ee3
Merge pull request #3069 from Citadel-Station-13/upstream-merge-31185
...
[MIRROR] Fixes gen scanner timer
2017-10-01 23:40:35 -04:00
2cafd6fefb
Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086
...
[MIRROR] Adds desc to things lacking them.
2017-10-01 23:37:35 -04:00
a468f609d8
Merge pull request #3054 from Citadel-Station-13/upstream-merge-31163
...
[MIRROR] Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
2017-10-01 23:37:09 -04:00
d9c77f628d
Fixes gen scanner timer
2017-10-01 17:03:52 -05:00
1c00a8ba29
Update recycler.dm
2017-10-01 15:38:09 -05:00
f0379ec3f3
Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605
...
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
2017-10-01 16:30:40 -04:00
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
8636b0a942
Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
2017-10-01 09:26:45 -05:00
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
0f387451f7
You can now examine an airlock to find out how to construct/deconstruct it ( #30605 )
...
* Tweaks rwall construction examine-messages.
* Tweaks window construction examine-messages.
* Added airlock construction examine messages.
* Typo fix.
* Shortened the airlock electronics circuit message.
* Fixed examine text styles.
* Fixes.
* Fixed wall-examine showing on rwalls.
* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.
* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.
* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.
* Removed unnecessary rwall-examine.
* Sound full path.
2017-10-01 00:04:14 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
9e48311632
Update cloning.dm
2017-09-30 14:27:04 -05:00
07c95ef168
Update aifixer.dm
2017-09-30 14:26:41 -05:00
cc9e462988
Update camera_assembly.dm
2017-09-30 14:26:22 -05:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
98d6927eb6
Cleanup to various loc assignments and nearby code
2017-09-30 08:10:52 -05:00
7df3c80a39
Update cloning.dm
2017-09-29 23:41:44 -05:00
LetterJay