Commit Graph

9924 Commits

Author SHA1 Message Date
Zuhayr
56b68b9abe Fixes #9847 2015-06-20 22:15:38 +09:30
Zuhayr
c8c35acf3a Fixes #9785 2015-06-20 22:12:38 +09:30
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
Zuhayr
5c22ba85c0 Merge pull request #9839 from comma/dev-freeze
Fixes
2015-06-17 16:12:08 +09:30
Zuhayr
031c7db3e5 Merge pull request #9821 from mwerezak/tableshaveturned
Makes standard tables plastic, related changes
2015-06-17 14:35:22 +09:30
Chinsky
b2779d6302 Fixes #9538
One does not simply qdel a list. Should be fine since it doesn't hold any objects, just bunch of strings.
2015-06-17 06:57:38 +03:00
Chinsky
5754c4edf7 Fixes #9211
Instead of several minutes long spawn, blood is added to processing for drying out now. Processing proc itself is just compraing two vars so shouldn't be as bad.
This way it doesn't get referenced by unnamed proc and can be qdel'd properly.
2015-06-17 06:50:08 +03:00
Chinsky
cc4f4d7bb2 Fixes #9834 2015-06-17 03:22:27 +03:00
mwerezak
70433b4367 Makes showers wash away touching reagents
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
mwerezak
f0c096627c Matches can be used to light things in adjacent turfs when thrown 2015-06-16 16:25:59 -04:00
PsiOmegaDelta
37f59551fc Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
93c3d03801 Merge pull request #9817 from GinjaNinja32/records
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
4da75dba68 Fixes some more unbalanced HTML 2015-06-15 10:48:30 +01:00
mwerezak
eb0f1fa69e Makes R-walls double plasteel
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
2015-06-14 15:33:48 -04:00
mwerezak
dec1461f6c Fixes chair preview icon 2015-06-14 14:55:04 -04:00
GinjaNinja32
3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
Kelenius
86b080769c Fixes two log destroyers 2015-06-14 15:54:07 +03:00
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
Zuhayr
7ff2a9415a Merge pull request #9805 from GinjaNinja32/follow-with-camera
Renames Track-With-Camera to Follow-With-Camera
2015-06-14 00:05:04 +09:30
PsiOmegaDelta
5f925d92c7 Merge pull request #9803 from GinjaNinja32/wizardsuit
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 15:25:35 +02:00
GinjaNinja32
aa3c68d3c2 Renames Track-With-Camera to Follow-With-Camera
Title. This means both AIs and ghosts can get space-completion for following a specific mob from 'fol', rather than AIs needing 'tra' and ghosts needing 'fol'.
2015-06-13 14:12:59 +01:00
GinjaNinja32
9613fae16a Wizard suits will now be refitted automatically for non-human wizards 2015-06-13 13:43:51 +01:00
Zuhayr
b2dacae3eb Merge pull request #9791 from GinjaNinja32/cryopod
Cryogenic/robotic storage now uses alt-title for announcements
2015-06-12 15:18:41 +09:30
GinjaNinja32
951a7b7347 Cryogenic/robotic storage now uses alt-title for announcements
Fixes #9790.
2015-06-11 21:44:08 +01:00
GinjaNinja32
d31cf8f3d8 Merge pull request #9786 from LightningIron/dev-freeze
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
unknown
c062f886c0 Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel. 2015-06-10 22:07:52 -05:00
unknown
fe2ce02f54 Fixes #9744. 2015-06-10 21:50:48 -05:00
Ccomp5950
a2298df036 Merge pull request #9776 from Zuhayr/dev-freeze
Fixes
2015-06-10 21:40:20 -04:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
Zuhayr
347e6df2ac Merge pull request #9704 from atlantiscze/clean-up-your-trash
[Done] Implements Destroy()'s on some things
2015-06-10 23:07:38 +09:30
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master
Dev-freeze.
2015-06-10 11:04:54 +02:00
Zuhayr
84ae0dd3d1 Merge pull request #9768 from LightningIron/master
Fixes #9731 and #9469
2015-06-10 13:35:41 +09:30
mwerezak
8007d42783 Adjusts usages of reagent transfer procs
Adds splash() proc for futureproofing.
Replaces instances of splash_mob() with splash()
Replaces instances of trans_to() with splash() where appropriate.
2015-06-10 00:03:08 -04:00
unknown
13a43e6cfd Changes description update spawn() to use 0 instead of small decimal. 2015-06-09 22:35:16 -05:00
unknown
2dbd0ac007 Fixes formatting for spawn() before updating description. 2015-06-09 22:02:14 -05:00
unknown
b1368fb712 Changes chemgrenade time in description to be correct after failed detonation. 2015-06-09 19:51:33 -05:00
unknown
17488168ab Fixes for #9731 and #9469. 2015-06-09 18:49:09 -05:00
Chinsky
bb824dba42 Merge pull request #9721 from atlantiscze/apcfix
Refactors /obj/item/apc_frame to /obj/item/frame/apc
2015-06-07 12:43:01 +03:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
2015-06-07 10:30:27 +02:00
PsiOmegaDelta
ddc1f888dd Merge pull request #9717 from mwerezak/bombcap
Adjusts how reagents_explosion applies bombcap.
2015-06-07 08:50:45 +02:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc
- This fixes broken APC frame placement on walls - #9537
2015-06-07 06:26:10 +02:00
mwerezak
821285bcee Adds defines for bombcap components 2015-06-06 22:38:56 -04:00
mwerezak
636ead5bbe Makes reagents_explosion apply bombcap in the same manner as tank transfer valves.
Also fixed reagents_explosion/start() checking the flash var instead of the flashing var.

Fixes #8280
2015-06-06 22:17:11 -04:00
GinjaNinja32
8d799293ba Merge pull request #9701 from Zuhayr/dev-freeze
Fixes #9597
2015-06-07 03:14:06 +01:00
PsiOmegaDelta
e48b527c4b Merge pull request #9708 from atlantiscze/newmalf-manual-change
RSC paths for ai_help command
2015-06-06 15:41:24 +02:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
Atlantis
8a5a969002 More Destroy()s, better implementation
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
2015-06-06 11:04:41 +02:00
Atlantis
4b19e8be69 Fixes #9548
- AI's name is now correctly displayed when the AI is clientless while being grabbed with intellicard.
- AI's wireless radio is no longer automatically muted when the AI is transferred to intellicard. It may still be muted from the UI if the intellicard's owner wants it.
2015-06-06 06:28:46 +02:00
Zuhayr
f03fc826f1 Fixes #9597 2015-06-06 11:20:56 +09:30
GinjaNinja32
fb1904ef4e Fixes a pair of null.z runtimes
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
2015-06-06 02:23:06 +01:00