e47c59c98b
Add remove buttons directly to Chem Dispenser
2015-12-02 00:09:51 -05:00
6a6960ecd8
Merge pull request #13368 from neersighted/chem_warnings
...
Remove an unused var from Chemistry-Machinery
2015-12-02 14:58:01 +11:00
6aa3ed1f9c
Remove an unused var from Chemistry-Machinery
2015-12-01 17:09:03 -06:00
7f89216b7f
Fix Cryo; make escaping easier.
...
We initialize efficiency as 1 to make sure it works even if
parts are not upgraded.
Make it a tad easier to escape.
Fixes #13364
2015-12-01 17:04:09 -06: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
d616885241
Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
...
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
e091d35439
Merge pull request #13334 from AnturK/botfix
...
Bot fixes
2015-12-01 21:00:23 +03:00
bf530cc3dd
Fixes untouchable windows
...
Sorry about that. Fixes #13354
2015-12-01 11:54:09 -05:00
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
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
37d1111685
Merge pull request #13310 from swankcookie/Cloak_fix
...
puts cloak in suit slot
2015-11-30 21:34:52 -06:00
c9ee58c120
Merge pull request #13253 from SuperSayu/abstract_holodeck
...
Holodeck Fixes
2015-11-30 21:26:52 -06:00
5f6bac6d15
Fix Cryo relaymove()
2015-11-30 21:29:33 -05:00
b425aa538d
Make Cryo auto-ejection optional.
2015-11-30 21:18:03 -05: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
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
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05: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
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
b72eb05c28
Merge pull request #13314 from AnturK/teleportfix
...
Fixes Teleport spell
2015-11-30 10:53:52 +03:00
c2d4f17fb7
Merge pull request #13297 from YotaXP/swarmer-crystal
...
Make swarmers drop a bluespace crystal
2015-11-30 01:44:57 -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
dfb2f81b7f
Apparently this check is redundant
2015-11-29 21:28:25 -05: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
3c1614e62d
Remove Cryo eject verb, revert sleeping/knockout removal, give resist a delay
...
Some shitler removed the sleeping effect
2015-11-29 19:05:04 -05: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
3c005616d5
Make swarmers drop ARTIFICIAL bluespace crystals.
2015-11-29 16:18:42 -05:00
a2bcbf5db7
Merge pull request #13279 from tkdrg/PUTTING_YOUR_VARS_IN_A_POOL
...
Ports the /vg/ pooling resetVars by Clusterfack
2015-11-29 23:36:07 +03: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
Bjorn Neergaard
Jordie
Razharas
duncathan salt
Vincent
Kyle Spier-Swenson
Incoming
Cheridan
AnturK
KorPhaeron
YotaXP
Tkdrg
swankcookie
Remie Richards
as334