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
9705746625
adds nt's sprite for syndielite suit
2015-11-30 15:43:47 +11: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
77b841fe9b
Merge pull request #13305 from KorPhaeron/hardhat
...
Removes relative pathing in hardhat.dm
2015-11-29 17:30:27 -06:00
126e2ce5e3
Merge pull request #13289 from phil235/HostileAnimalProjectileFix
...
Hostile Animal Projectile Fix
2015-11-29 17:25:24 -06:00
06e5df9336
Fix NanoUI missing assignment; use two-line ifs
2015-11-29 18:20:10 -05:00
df02a33f3d
Remove redundant NanoUI checks
2015-11-29 17:49:29 -05:00
8ba095a931
Fix a typo
2015-11-29 16:56:22 -05:00
6fca11d85f
Merge pull request #13292 from neersighted/nanoui_update
...
Fix Chemistry NanoUIs
2015-11-29 15:42:28 -06:00
97568959a5
Xenomorph Royals are now immune to injection.
...
Royal Xenomorphs (Praetorian, Queen) can no longer be injected by
syringes or syringe guns.
2015-11-29 15:25:26 -06:00
3c005616d5
Make swarmers drop ARTIFICIAL bluespace crystals.
2015-11-29 16:18:42 -05:00
4da263dead
Fixes jobban_isbanned() runtime
...
Fixes runtime with ckey-less mobs.
2015-11-29 17:31:19 -03:00
808adcfa9d
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cloak_fix
...
# Conflicts:
# icons/mob/suit.dmi
2015-11-29 13:38:16 -06:00
edfb957bd2
Merge pull request #13088 from as334/master
...
Plasmamen fixes
2015-11-29 19:17:11 +00:00
0048a5b2a7
Fuck this, fuck you
2015-11-29 14:10:46 -05:00
53d66e698c
unneeded addition, i guess
2015-11-29 12:58:46 -06:00
dc98e67f05
Just fuck my shit up fam
2015-11-29 13:48:58 -05:00
a9cfc6eb8a
Merge pull request #13288 from AnturK/topicfix
...
Fixes AI canUseTopic
2015-11-29 12:35:03 -06:00
f7eae879d2
Merge pull request #13004 from Shadowlight213/mobbuffs
...
buffs syndicate simple mobs
2015-11-29 12:33:09 -06:00
9e9ccf9474
Merge pull request #13268 from Anonus/teachingsofnarsie
...
Cult theme update
2015-11-29 12:23:07 -06:00
fba1c1129a
fine, fine fuck okay sure
...
don't sacrifice dogs, okay? nar-sie has standards, of a sort
2015-11-29 13:11:18 -05:00
f67dde21d5
foundation set, demands given.
2015-11-29 12:34:49 -05:00
f214e547cb
NanoUI Airlock Electronics
...
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
59963b89b5
quant --> quaint
2015-11-29 08:00:33 -08:00
Bjorn Neergaard
duncathan salt
Kyle Spier-Swenson
Vincent
KorPhaeron
Cheridan
Incoming
Razharas
AnturK
YotaXP
Jordie0608
GunHog
Tkdrg
swankcookie
Remie Richards
as334
Nerd Lord
MMMiracles