e96590ff59
Make Ctrl-Click unpull work by using the verb
...
Did not realize this didn't use the verb.
2015-12-01 23:08:07 -05:00
9f35e17513
Gives artificers feedback when healing another construct, showing how much health it has.
...
Constructs can into space.
Fixes cult flooring not lining up with normal floors, I don't care if you're evil, this is just wrong.
Fixes a juggernaut back spine being not glowy enough.
2015-12-01 23:05:41 -05:00
ee522d61d7
Merge branch 'master' of https://github.com/tgstation/-tg-station into fewinhandsprites
2015-12-02 06:05:40 +02:00
3a85a3777f
Spares those in critical from the mass mindshuffle event.
...
This was always the intention, but past me made a mistake I know I've made and fixed sense: He assumed that living_mob_list was a list of !stat mobs, when really it was a list of stat != 2 mobs
2015-12-01 23:05:35 -05:00
3e5e9086c0
fix
2015-12-01 21:52:35 -06:00
6aa3ed1f9c
Remove an unused var from Chemistry-Machinery
2015-12-01 17:09:03 -06:00
2b0ee4f591
Admin HUD improvements
...
Adds the sec hud for implants and stuff.
2015-12-01 19:15:06 -03:00
b864503724
Merge pull request #13336 from neersighted/chem_nanoui_fixes
...
Remove calls to a private NanoUI proc from Chemistry-Machinery
2015-12-02 00:40:52 +03:00
e091d35439
Merge pull request #13334 from AnturK/botfix
...
Bot fixes
2015-12-01 21:00:23 +03:00
07a9aa65b8
More efficiency things
2015-12-01 17:32:33 +00:00
e628f4869b
Makes faction checking more efficient. Adds a chime to go with the exclamation mark.
2015-12-01 17:15:46 +00:00
8b77dd0de1
Finally get this pulling check right
2015-12-01 08:37:38 -06:00
f3b0847042
!
2015-12-01 14:32:10 +00:00
2a7be3c878
Fix swapped check
2015-12-01 07:30:20 -05:00
a0394c94ed
Adds summon_backup() to hostile animals
2015-12-01 11:00:02 +00:00
e29b224ef2
Fixes flame armour
2015-12-01 02:00:35 -06:00
9335734e3f
forgot a quote
2015-11-30 23:22:22 -08:00
6b8436558e
Deleted 1 too many lines
2015-11-30 22:47:15 -08:00
03f29f3b99
Makes json writer use 90% less string tree operations
...
"[thing1][thing2][thing3]" and text() both compile to use only 1 string tree operation regardless of the number of args.
list2text abuses this to write 128 items of the list in 1 go, and it also handles the separator in the proper way, so no reason to not use it.
this also cuts 1 string tree operation out of every associative list write as well as 1 out of the writing of every item in that list.
So now the string tree O notation should be O(n log2(M)) rather then O(N^M) (ish)
2015-11-30 22:45:31 -08:00
3428e0e734
Fix NanoUI display issues
...
Apparently newer version of IE choke on this, and we target newer
versions anyway...
2015-12-01 00:22:50 -05:00
6f098e8298
Allow ghosts to use any NanoUI interface.
2015-11-30 23:34:59 -05:00
37d1111685
Merge pull request #13310 from swankcookie/Cloak_fix
...
puts cloak in suit slot
2015-11-30 21:34:52 -06:00
c523dfcb85
Allow you to stop pulling by pulling the same object again.
2015-11-30 22:27:41 -05:00
c9ee58c120
Merge pull request #13253 from SuperSayu/abstract_holodeck
...
Holodeck Fixes
2015-11-30 21:26:52 -06:00
b4bcaa3930
Tweak some NanoUI stuff
...
Sanitize config_data
Log open UIs
2015-11-30 22:21:26 -05:00
02b4ce079a
Fixes library computer's next page not working.
2015-11-30 18:40:42 -08:00
2d9ecd54a9
FIXES DEAD CHAT QUICK MERGE PLS
2015-11-30 17:26:58 -08:00
16303c1c1f
Changes flag name from ABSTRACT to NODECONSTRUCT
...
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this. Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
f7c88bb42c
Merge pull request #13319 from tkdrg/jobbanfix
...
Fixes jobban_isbanned() runtime
2015-11-30 15:04:58 -06:00
339369bc63
Remove calls to a private NanoUI proc from Chemistry-Machinery
...
Also mark procs as private (because they should have been private the whole time).
Get off my lawn!
2015-11-30 14:40:10 -06:00
0c1d7272d5
Adds fudge dice
...
They're six sided dice with two pluses, two minusii, and two blank sides.
They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.
Adds them to the "rare dice" spawn in dice bags.
Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.
Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
0a62f392e5
Merge pull request #13299 from MrStonedOne/patch-75
...
Gives deadchat the (f) follow link.
2015-11-30 13:23:40 -06:00
78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
a8ea3e25c1
Fixes player medbot overdoses
...
Makes braindead bots get back to work.
2015-11-30 16:52:25 +01:00
3c0100cbf1
Merge pull request #13291 from GunHog/Nanotrasen_Science_Handheld_Clown_Removal_Device
...
The Bluespace Wormhole Projector now teleports mobs!
2015-11-30 18:18:22 +03:00
4f38906dd5
Merge pull request #13311 from KorPhaeron/wild_west
...
Fixes wild west windows
2015-11-30 07:12:05 -06:00
b216ffe457
Fixes Player bots moving while deactivated
...
Fixes Player bot radios
Removes unused HEADSET_SECURE radio mode
Adds secbot/ed209 stuns to attack log
Allows player mulebots to drop the cargo by resisting
2015-11-30 14:07:38 +01:00
102896196f
lighting tweaks
2015-11-30 01:44:44 -08:00
7de857b476
Upgrades the space heater!
2015-11-30 04:11:10 -05:00
c2d4f17fb7
Merge pull request #13297 from YotaXP/swarmer-crystal
...
Make swarmers drop a bluespace crystal
2015-11-30 01:44:57 -06:00
c32fca7673
Redoes reactive armour
2015-11-30 00:04:05 -06:00
76b71469ea
Merge pull request #13308 from swankcookie/autorifle_fix
...
Changes ammo type in autorifle desc
2015-11-29 23:30:14 -06:00
5e9017977d
Merge pull request #13298 from neersighted/attack_anim
...
Improve Attack animations
2015-11-29 23:17:02 -06:00
ad410e39d8
Merge pull request #13296 from neersighted/nanoui_checks
...
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
0f2eee4e17
Cleans up meatgrinder code
2015-11-29 18:30:34 -06:00
3f231755cf
Merge pull request #13295 from KorPhaeron/wj_hates_fun
...
Removes simple xenomorphs from gold slime cores
2015-11-29 18:07:09 -06:00
05ae680b06
Fixing conflicts:
...
code/game/machinery/computer/computer.dm
code/game/machinery/doors/windowdoor.dm
code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
Bjorn Neergaard
Nerd Lord
kingofkosmos
Incoming
swankcookie
Tkdrg
Razharas
Thunder12345
KorPhaeron
Kyle Spier-Swenson
duncathan salt
Vincent
Cheridan
AnturK
YotaXP