Chinsky
b437c5654a
Merge pull request #8902 from PsiOmegaDelta/FiredoorFixTwo
...
Another emergency shutter fix.
2015-04-19 16:10:07 +03:00
Chinsky
940b5c8c62
Merge pull request #8891 from volas/sanitize3
...
sanitize() 3
2015-04-19 14:59:36 +03:00
Chinsky
109aed4fcf
Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst
...
Fixes #8895 .
2015-04-19 14:59:25 +03:00
Chinsky
a3962980ac
Merge pull request #8898 from PsiOmegaDelta/eject_cartridge
...
Adds a PDA cartridge ejection verb.
2015-04-19 14:56:59 +03:00
Zuhayr
0b03a389df
Merge pull request #8910 from Baystation12/master
...
Master into dev
2015-04-19 17:26:04 +09:30
Neerti
b178e56a3b
Lazy fix because microwaves are terrible.
2015-04-18 22:04:05 -04:00
PsiOmega
27abc7404d
Gives AI a personal atmospherics control subsystem.
...
Includes further work on NanoUI interactions.
2015-04-19 00:24:19 +02:00
PsiOmega
b295b9e3c6
Another emergency shutter fix.
...
I goofed, and dropped the distance check.
2015-04-18 20:13:25 +02:00
PsiOmega
804ca5aa0b
Fixes #8250 .
...
Uncomplicates the examine pre-check.
Ensures door/examine() returns the proper value.
2015-04-18 19:25:22 +02:00
PsiOmega
c39c929db7
Adds a PDA cartridge ejection verb.
...
The most requested feature.
2015-04-18 18:18:11 +02:00
PsiOmega
725e3335d2
Fixes #8895 .
...
Laptops now use the proper proc for checking camera status.
2015-04-18 17:49:40 +02:00
volas
dbd239f4ec
Corrections dual sanitizing
2015-04-18 17:49:25 +03:00
Chinsky
0206d6db8f
Merge pull request #8868 from Jarcolr/patch-2
...
Fixes #8633
2015-04-18 17:44:22 +03:00
Chinsky
3819fe8d03
Merge pull request #8747 from Kelenius/ofJarsAndLizards
...
The return of the jars
2015-04-18 17:01:08 +03:00
Chinsky
511d3764e7
Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe
...
Makes objects without moues opacity not appear via alt-click.
2015-04-18 16:57:01 +03:00
PsiOmegaDelta
0b6affb274
Merge pull request #8877 from Jarcolr/patch-3
...
Fixes #8559
2015-04-18 15:55:45 +02:00
Chinsky
0d77262c69
Merge pull request #8885 from PsiOmegaDelta/EngineerMasterJob
...
Fixes #7943 .
2015-04-18 16:55:06 +03:00
Zuhayr
bc9d1ba38b
Merge pull request #8893 from Baystation12/dev-freeze
...
Dev freeze into dev
2015-04-18 21:50:40 +09:30
PsiOmega
f5948f8bb6
Fixes #7943 .
...
Access to engineering equipment is now enough to manipulate shield generators.
2015-04-18 11:52:03 +02:00
Den
1ff0eda601
Change dismantle turf to pipe turf.
2015-04-17 20:34:30 +03:00
Jarcolr
1cf3fa4c7a
Fixes #8559
...
Device.dmi is where the sunflower icon is, this is targeting dev because it is ahead on master on this file.
2015-04-17 15:55:15 +03:00
Jarcolr
0030ca76af
Spans instead of fonts.
...
Hopefully no typos.
2015-04-17 15:34:37 +03:00
PsiOmega
a6a428af6a
Mecha + misc. Destroy() because I had already begun.
2015-04-17 09:55:59 +02:00
PsiOmega
4b040d93ba
Continues the painful process of porting Destroy()s, Dels(), and everything else needed for qdel.
2015-04-17 09:47:19 +02:00
PsiOmega
858b56a2e5
The Nar-Sie summoning ritual is now animated.
2015-04-17 08:04:59 +02:00
GinjaNinja32
159dccbfab
Fixes floor painter solid-dark icon
...
Fixes #8873
2015-04-17 03:18:53 +01:00
Den
1a000ea53c
Add rework switch to list of pipe types.
2015-04-16 20:54:12 +02:00
Den
6f77a98bc3
Fix activating with no metal.
2015-04-16 20:15:40 +02:00
Kelenius
ec1b6f122c
Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards
...
Conflicts:
icons/obj/items.dmi
maps/exodus-1.dmm
2015-04-16 19:17:10 +03:00
Den
737b4fc08e
dismantle Fix
2015-04-16 16:42:57 +02:00
Den
0edb5a2ba5
user << add user.visible_message() replace
2015-04-16 16:40:06 +02:00
Kelenius
0c9eb8a112
Minor jar fixes
2015-04-16 17:30:01 +03:00
Jarcolr
9fda2a2614
Fixes #8633
...
Hopefully the wording is okay. Targeting dev because this file is ahead on master.
2015-04-16 17:27:57 +03:00
PsiOmega
1daf0abe3d
Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds.
2015-04-16 14:23:19 +02:00
PsiOmega
d381eb6083
Drops the machinery part of the singularity.
2015-04-16 12:51:02 +02:00
PsiOmega
3eab61e154
Soap can now clean turfs as well.
2015-04-16 08:20:00 +02:00
GinjaNinja32
54044859bf
Fix cryopod moving robots to nullspace instead of deleting
2015-04-15 14:28:36 +01:00
Chinsky
b94366067a
Merge pull request #8840 from PsiOmegaDelta/NanoI
...
Fixes NanoUI interaction.
2015-04-15 02:12:12 +03:00
Chinsky
7848a1c300
Merge pull request #8815 from PsiOmegaDelta/CultPorting
...
Ports /tg/vg/'s Nas-Sie remake
2015-04-15 02:12:05 +03:00
Den
16ddaf3d01
Fix "sheets", add \The, add round's
2015-04-14 19:02:07 +03:00
Zuhayr
00f6ca5d28
Merge pull request #8836 from PsiOmegaDelta/HighwayToTheDangerZone
...
Engineering/police tape can now create floor markings.
2015-04-14 23:40:11 +09:30
PsiOmega
516b60962e
Merge remote-tracking branch 'upstream/dev' into CultPorting
2015-04-14 15:54:22 +02:00
Chinsky
a601c50f08
Merge pull request #8839 from PsiOmegaDelta/PAPs
...
Camera network refactor - Part 3 - Final
2015-04-14 16:32:14 +03:00
PsiOmega
0466a1f47a
Camera network refactor - Part 3
...
Swept through every single Z-level, re-named/networked every single camera.
Fixes the AI Jump-To-Network verb not properly updating the network (used by the Show-Camera-List verb).
Also removes redundant Cancel option in the Show-Camera-List.
2015-04-14 11:41:01 +02:00
Den
3c4fc3b76b
Fixes
2015-04-14 11:24:55 +03:00
Den
e5794adb9a
Fix pipelayer.dm path
2015-04-14 11:11:02 +03:00
PsiOmega
aa5d5d5256
Fixes NanoUI interaction.
...
A number of machinery objects were returning STATUS_INTERACTIVE instead of parent.
Fixes missing subtype definition for /var/global/datum/topic_state/default/default_state.
2015-04-13 23:19:22 +02:00
PsiOmega
18e89ff042
Engineering/police tape can now create floor markings.
...
Apply tape to floor, get hazard overlay.
Apply tape to the same floor and in the same direction again to remove hazard overlay.
2015-04-13 15:57:45 +02:00
Zuhayr
03b85a5cb4
Merge pull request #8835 from Zuhayr/dev
...
Removed some cocked up files.
2015-04-13 23:02:41 +09:30
Zuhayr
7129feb417
Removed some cocked up files.
2015-04-13 22:58:32 +09:30