e7faa19ea3
Merge pull request #9779 from Baystation12/master
...
Dev-freeze.
2015-06-10 11:04:54 +02:00
84ae0dd3d1
Merge pull request #9768 from LightningIron/master
...
Fixes #9731 and #9469
2015-06-10 13:35:41 +09:30
13a43e6cfd
Changes description update spawn() to use 0 instead of small decimal.
2015-06-09 22:35:16 -05:00
2dbd0ac007
Fixes formatting for spawn() before updating description.
2015-06-09 22:02:14 -05:00
b1368fb712
Changes chemgrenade time in description to be correct after failed detonation.
2015-06-09 19:51:33 -05:00
17488168ab
Fixes for #9731 and #9469 .
2015-06-09 18:49:09 -05:00
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
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
ddc1f888dd
Merge pull request #9717 from mwerezak/bombcap
...
Adjusts how reagents_explosion applies bombcap.
2015-06-07 08:50:45 +02:00
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
821285bcee
Adds defines for bombcap components
2015-06-06 22:38:56 -04:00
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
8d799293ba
Merge pull request #9701 from Zuhayr/dev-freeze
...
Fixes #9597
2015-06-07 03:14:06 +01:00
e48b527c4b
Merge pull request #9708 from atlantiscze/newmalf-manual-change
...
RSC paths for ai_help command
2015-06-06 15:41:24 +02:00
f0026b5c3b
RSC paths for ai_help command
2015-06-06 14:55:33 +02:00
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
f03fc826f1
Fixes #9597
2015-06-06 11:20:56 +09:30
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
2da0a5e979
Merge pull request #9690 from Kelenius/ofPuffsAndCleaner
...
Of puffs and cleaner
2015-06-05 20:02:08 +02:00
345cd7a738
Adds a simulated check to chempuffs
2015-06-05 19:20:46 +03:00
19e0a94c17
Merge pull request #9686 from PsiOmegaDelta/150605-DontDoThat
...
Removes some qdel:s of lists.
2015-06-05 15:10:53 +03:00
2ba5fd6af2
Merge branch 'dev-freeze' into ofPuffsAndCleaner
...
Conflicts:
code/game/objects/effects/chem/water.dm
2015-06-05 14:36:15 +03:00
e1d6af1d27
Fixes #9352
2015-06-05 14:30:01 +03:00
979b6adcae
Removes some qdel:s of lists.
...
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02:00
7f9996eece
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-05 10:23:23 +02:00
c21985f39d
Merge pull request #9679 from GinjaNinja32/humans_are_not_hats
...
Removes briefcase instastun and crappy helmet check
2015-06-05 10:17:02 +02:00
c3c40ed7f5
Merge pull request #9665 from PsiOmegaDelta/150604-DatumPool
...
Fixes #9664 .
2015-06-05 17:36:31 +09:30
67ccb6997b
Entirely removes briefcase instastun and pointless New() definition
2015-06-05 09:00:19 +01:00
2507a8007b
Comments out a section that requires a single object to be both /mob/living/carbon/human and /obj/item/clothing/head
2015-06-05 01:10:15 +01:00
e44a4805f2
Merge pull request #9663 from PsiOmegaDelta/150604-StackFixes
...
Stack splitting and cable merging fixes.
2015-06-04 23:19:08 +01:00
224cbb41bf
Garbage/qdel changes.
...
Moves atom/Destroy() into atom/movable/Destroy(). Is now a /tg/ copy-paste.
Means deleting turfs no longer wipes everything on that turf and that pulling is canceled.
qdel no longer willingly accepts lists.
2015-06-04 19:32:05 +02:00
6fb1ea85e1
Adds a notice to StaffWho that adminhelps are also sent to IRC.
2015-06-04 15:21:42 +02:00
2373eb4bdd
Fixes #9664 .
...
Datum pool no longer creates a new object just for the sake of it when initializing pool lists.
Also bandaids an issue where water could be qdeled while being sprayed and reagents nulled, because someone calls spawn() qdel in new.
Datum pool now also adds excess pool objects on the trash pile instead of calling del directly.
2015-06-04 14:42:39 +02:00
65fc980b20
Stack splitting and cable merging fixes.
...
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +02:00
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
9d9efc336b
Merge pull request #9649 from mwerezak/fixes
...
Fixes
2015-06-03 11:45:45 +09:30
45d60ab551
Fixes #9640
2015-06-02 22:00:34 -04:00
2514c56c01
Merge pull request #9642 from comma/cryopod
...
Saves rank and time too in cryopod logs.
2015-06-02 20:17:08 +02:00
f8cfd491f7
Now with radios
2015-06-02 18:38:49 +03:00
5ed365d96b
Saves rank and time too in cryopod logs.
...
It's usually very hard to guess who all those people are on pure name list, and purging records screws over investigations enough as it is :<
2015-06-02 18:34:47 +03:00
c873825a42
Fixes #6029
2015-06-02 14:27:16 +03:00
87c32af3dc
Fixes #9545
2015-06-02 14:00:39 +03:00
ff592c751a
Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
...
End game tweaks
2015-05-31 23:55:08 +03:00
d5e0a60a6b
Merge pull request #9566 from PsiOmegaDelta/150529-Doors
...
Fixes #9559 .
2015-05-31 20:11:33 +01:00
c1cc002109
Merge pull request #9601 from Techhead0/survivalBox
...
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
9047bbe2a2
Removes O2 tank and spare mask from Vox boxes.
2015-05-31 14:17:24 -04:00
0f0fcf2d46
Re-adds extended oxygen tanks to relevant jobs.
2015-05-31 14:08:46 -04:00
aa2564b798
Fixes #9556
...
Also fixes missing backpacks for assistants.
2015-05-31 14:03:41 -04:00
3620c49b08
Fixes #9462
2015-05-31 12:41:39 -04:00
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
PsiOmegaDelta