Razharas
7a8ea82617
Merge pull request #13321 from neersighted/cryo_fix
...
Remove Cryo eject verb, revert sleeping/knockout removal, give resist a delay
2015-12-01 16:35:34 +03:00
Bjorn Neergaard
2a7be3c878
Fix swapped check
2015-12-01 07:30:20 -05:00
Bjorn Neergaard
0dcfd67796
We use pipes.
2015-12-01 07:28:53 -05:00
Thunder12345
a0394c94ed
Adds summon_backup() to hostile animals
2015-12-01 11:00:02 +00:00
Incoming5643
8df0899f57
I don't think this is actually needed for whatever reason, but lets be safe.
2015-12-01 03:12:55 -05:00
Incoming
716ed77501
Changes up how OOC checks to see that you agreed that a message isn't accidental IC.
...
It now passes a special string, "|~|", in front of your message and runs it through OOC again. The string saves the message from further scrutiny, and is then cut off.
2015-12-01 03:07:34 -05:00
KorPhaeron
e29b224ef2
Fixes flame armour
2015-12-01 02:00:35 -06:00
Kyle Spier-Swenson
9335734e3f
forgot a quote
2015-11-30 23:22:22 -08:00
Kyle Spier-Swenson
6b8436558e
Deleted 1 too many lines
2015-11-30 22:47:15 -08:00
Kyle Spier-Swenson
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
Incoming
eb3f0881da
emoji are now parsed with * instead of : to avoid running up against IC/OOC filters if you try to emoji at the start of a message.
2015-12-01 01:10:19 -05:00
Bjorn Neergaard
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
Bjorn Neergaard
6f098e8298
Allow ghosts to use any NanoUI interface.
2015-11-30 23:34:59 -05:00
duncathan salt
37d1111685
Merge pull request #13310 from swankcookie/Cloak_fix
...
puts cloak in suit slot
2015-11-30 21:34:52 -06:00
Bjorn Neergaard
c523dfcb85
Allow you to stop pulling by pulling the same object again.
2015-11-30 22:27:41 -05:00
duncathan salt
c9ee58c120
Merge pull request #13253 from SuperSayu/abstract_holodeck
...
Holodeck Fixes
2015-11-30 21:26:52 -06:00
Bjorn Neergaard
b4bcaa3930
Tweak some NanoUI stuff
...
Sanitize config_data
Log open UIs
2015-11-30 22:21:26 -05:00
Kyle Spier-Swenson
02b4ce079a
Fixes library computer's next page not working.
2015-11-30 18:40:42 -08:00
Bjorn Neergaard
5f6bac6d15
Fix Cryo relaymove()
2015-11-30 21:29:33 -05:00
Bjorn Neergaard
aadfa979e6
Blame MSO
...
@MrStonedOne
2015-11-30 21:23:57 -05:00
Bjorn Neergaard
b425aa538d
Make Cryo auto-ejection optional.
2015-11-30 21:18:03 -05:00
Bjorn Neergaard
47e9a7771a
Fix up SStimer, make Crew Console use SStimer
...
Remove crappy proc queue as well...
2015-11-30 20:56:45 -05:00
GunHog
c09b880fa4
Fixes inability to upgrade gun rechargers
...
Adds missing exchange_parts() proc
2015-11-30 19:54:41 -06:00
Kyle Spier-Swenson
2d9ecd54a9
FIXES DEAD CHAT QUICK MERGE PLS
2015-11-30 17:26:58 -08:00
Vincent
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
Incoming
42da16a003
adds swankcookie's snowman stuff to the gifts that will spawn on christmas should the trees exist which hopefully they will!
2015-11-30 19:21:53 -05:00
KorPhaeron
c29f2ef837
Internals start at 16 pressure
2015-11-30 18:12:32 -06:00
Vincent
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
KorPhaeron
6be3a6fd58
Cleans up copypaste but this time it compiles
2015-11-30 16:50:17 -06:00
KorPhaeron
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
KorPhaeron
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
Cheridan
f7c88bb42c
Merge pull request #13319 from tkdrg/jobbanfix
...
Fixes jobban_isbanned() runtime
2015-11-30 15:04:58 -06:00
Bjorn Neergaard
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
Incoming
d8f6039834
Accidental remnant of another pull got in
2015-11-30 15:22:58 -05:00
Incoming
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
Cheridan
0a62f392e5
Merge pull request #13299 from MrStonedOne/patch-75
...
Gives deadchat the (f) follow link.
2015-11-30 13:23:40 -06:00
YotaXP
75f87f370f
Added template and some tweaks.
2015-11-30 14:16:05 -05:00
Razharas
78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
AnturK
a8ea3e25c1
Fixes player medbot overdoses
...
Makes braindead bots get back to work.
2015-11-30 16:52:25 +01:00
Razharas
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
Cheridan
4f38906dd5
Merge pull request #13311 from KorPhaeron/wild_west
...
Fixes wild west windows
2015-11-30 07:12:05 -06:00
AnturK
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
MrStonedOne
102896196f
lighting tweaks
2015-11-30 01:44:44 -08:00
YotaXP
5b170c8bc0
4am will do that to ya
2015-11-30 04:25:20 -05:00
YotaXP
7de857b476
Upgrades the space heater!
2015-11-30 04:11:10 -05:00
Razharas
b72eb05c28
Merge pull request #13314 from AnturK/teleportfix
...
Fixes Teleport spell
2015-11-30 10:53:52 +03:00
Cheridan
c2d4f17fb7
Merge pull request #13297 from YotaXP/swarmer-crystal
...
Make swarmers drop a bluespace crystal
2015-11-30 01:44:57 -06:00
KorPhaeron
c32fca7673
Redoes reactive armour
2015-11-30 00:04:05 -06:00
Cheridan
76b71469ea
Merge pull request #13308 from swankcookie/autorifle_fix
...
Changes ammo type in autorifle desc
2015-11-29 23:30:14 -06:00
Cheridan
5e9017977d
Merge pull request #13298 from neersighted/attack_anim
...
Improve Attack animations
2015-11-29 23:17:02 -06:00