PsiOmegaDelta
2da0a5e979
Merge pull request #9690 from Kelenius/ofPuffsAndCleaner
...
Of puffs and cleaner
2015-06-05 20:02:08 +02:00
Kelenius
345cd7a738
Adds a simulated check to chempuffs
2015-06-05 19:20:46 +03:00
Chinsky
19e0a94c17
Merge pull request #9686 from PsiOmegaDelta/150605-DontDoThat
...
Removes some qdel:s of lists.
2015-06-05 15:10:53 +03:00
Kelenius
2ba5fd6af2
Merge branch 'dev-freeze' into ofPuffsAndCleaner
...
Conflicts:
code/game/objects/effects/chem/water.dm
2015-06-05 14:36:15 +03:00
Chinsky
e1d6af1d27
Fixes #9352
2015-06-05 14:30:01 +03:00
PsiOmegaDelta
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
PsiOmegaDelta
7f9996eece
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-05 10:23:23 +02:00
PsiOmegaDelta
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
Zuhayr
c3c40ed7f5
Merge pull request #9665 from PsiOmegaDelta/150604-DatumPool
...
Fixes #9664 .
2015-06-05 17:36:31 +09:30
GinjaNinja32
67ccb6997b
Entirely removes briefcase instastun and pointless New() definition
2015-06-05 09:00:19 +01:00
GinjaNinja32
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
GinjaNinja32
e44a4805f2
Merge pull request #9663 from PsiOmegaDelta/150604-StackFixes
...
Stack splitting and cable merging fixes.
2015-06-04 23:19:08 +01:00
PsiOmegaDelta
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
PsiOmegaDelta
6fb1ea85e1
Adds a notice to StaffWho that adminhelps are also sent to IRC.
2015-06-04 15:21:42 +02:00
PsiOmegaDelta
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
PsiOmegaDelta
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
PsiOmegaDelta
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
Zuhayr
9d9efc336b
Merge pull request #9649 from mwerezak/fixes
...
Fixes
2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551
Fixes #9640
2015-06-02 22:00:34 -04:00
PsiOmegaDelta
2514c56c01
Merge pull request #9642 from comma/cryopod
...
Saves rank and time too in cryopod logs.
2015-06-02 20:17:08 +02:00
Chinsky
f8cfd491f7
Now with radios
2015-06-02 18:38:49 +03:00
Chinsky
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
Chinsky
c873825a42
Fixes #6029
2015-06-02 14:27:16 +03:00
Chinsky
87c32af3dc
Fixes #9545
2015-06-02 14:00:39 +03:00
Chinsky
ff592c751a
Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
...
End game tweaks
2015-05-31 23:55:08 +03:00
GinjaNinja32
d5e0a60a6b
Merge pull request #9566 from PsiOmegaDelta/150529-Doors
...
Fixes #9559 .
2015-05-31 20:11:33 +01:00
GinjaNinja32
c1cc002109
Merge pull request #9601 from Techhead0/survivalBox
...
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2
Removes O2 tank and spare mask from Vox boxes.
2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46
Re-adds extended oxygen tanks to relevant jobs.
2015-05-31 14:08:46 -04:00
Techhead0
aa2564b798
Fixes #9556
...
Also fixes missing backpacks for assistants.
2015-05-31 14:03:41 -04:00
Techhead0
3620c49b08
Fixes #9462
2015-05-31 12:41:39 -04:00
Chinsky
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d
Added MATERIAL_PADDING flag.
2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f
Merge pull request #9582 from mwerezak/robolimbs
...
limb fixes
2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be
Sets w_class for external organs
...
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
PsiOmega
2f1202d5e0
Airlock fixes.
...
Changes door closing to use the same sound playing setup as door opening. Fixes #9559 .
2015-05-30 20:41:25 +02:00
Zuhayr
b3102824a0
Fixes #9544
2015-05-31 03:56:06 +09:30
Zuhayr
ae38961a65
Fixes #9551
2015-05-31 03:36:07 +09:30
Zuhayr
f9e99e1ee9
Fixes #9581
2015-05-31 03:34:29 +09:30
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
PsiOmegaDelta
12d1277925
Merge pull request #9577 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d
Merge pull request #9553 from GinjaNinja32/reagent_protection
...
Fixes #5945 , de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
PsiOmega
bf27545841
End game turf changes now simply alters color.
2015-05-29 23:38:09 +02:00
Zuhayr
deb806c4cb
Fixes #9076
2015-05-30 05:24:44 +09:30
Zuhayr
a3f3009eb4
Fixes #9063
2015-05-30 05:16:01 +09:30
Zuhayr
a4c2267984
Fixes #9386
2015-05-30 04:01:13 +09:30
Zuhayr
c5df326533
Fixes #9414
2015-05-30 03:15:19 +09:30
Zuhayr
887b8163cc
Fixes #9498
2015-05-30 02:56:01 +09:30
Zuhayr
5a339a66c1
Fixes #9510
2015-05-30 02:52:16 +09:30
Zuhayr
d3b7bcc42e
Fixes #9397
2015-05-30 02:41:13 +09:30
