diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm index 69b4cf6b29d..9a364ccbd6e 100644 --- a/code/datums/uplink/devices and tools.dm +++ b/code/datums/uplink/devices and tools.dm @@ -26,9 +26,9 @@ path = /obj/item/weapon/plastique /datum/uplink_item/item/tools/heavy_vest - name = "Heavy Armor Vest" + name = "Heavy Armor Kit" item_cost = 4 - path = /obj/item/clothing/suit/storage/vest/merc + path = /obj/item/weapon/storage/box/syndie_kit/armor /datum/uplink_item/item/tools/encryptionkey_radio name = "Encrypted Radio Channel Key" @@ -86,7 +86,7 @@ name = "Hacked Supply Beacon (DANGER!)" item_cost = 14 path = /obj/item/supply_beacon - + /datum/uplink_item/item/tools/advancedpinpointer name = "Advanced pinpointer" item_cost = 15 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3b4e0ed2b16..5dc88df97aa 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -632,6 +632,7 @@ About the new airlock wires panel: switch(animation) if("opening") cut_overlays() + compile_overlays() // Flick will prevent SSoverlays from changing the overlay list mid-flick, so we force it. if(p_open) flick("o_door_opening", src) update_icon() @@ -641,6 +642,7 @@ About the new airlock wires panel: if("closing") if(overlays) cut_overlays() + compile_overlays() if(p_open) flick("o_door_closing", src) update_icon() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 7a77b6551b4..1d5c31e4e66 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -85,7 +85,6 @@ update_nearby_tiles(need_rebuild=1) if (hashatch) setup_hatch() - return /obj/machinery/door/proc/setup_hatch() hatch_image = image('icons/obj/doors/hatches.dmi', src, hatchstyle, closed_layer+0.1) @@ -94,7 +93,6 @@ hatch_image.pixel_y = hatch_offset_y hatch_image.dir = dir - add_overlay(hatch_image) update_icon() /obj/machinery/door/proc/open_hatch(var/atom/mover = null) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 2d799ff2028..65c82223d87 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -374,6 +374,7 @@ return ..() /obj/machinery/door/firedoor/do_animate(animation) + compile_overlays() switch(animation) if("opening") flick("door_opening", src) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index d7f0755fe6d..3c45d4d64ee 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -158,22 +158,22 @@ desc = "A box full of syringes." icon_state = "syringe" - New() - ..() - new /obj/item/weapon/reagent_containers/syringe( src ) - new /obj/item/weapon/reagent_containers/syringe( src ) - new /obj/item/weapon/reagent_containers/syringe( src ) - new /obj/item/weapon/reagent_containers/syringe( src ) - new /obj/item/weapon/reagent_containers/syringe( src ) - new /obj/item/weapon/reagent_containers/syringe( src ) - new /obj/item/weapon/reagent_containers/syringe( src ) +/obj/item/weapon/storage/box/syringes/fill() + ..() + new /obj/item/weapon/reagent_containers/syringe( src ) + new /obj/item/weapon/reagent_containers/syringe( src ) + new /obj/item/weapon/reagent_containers/syringe( src ) + new /obj/item/weapon/reagent_containers/syringe( src ) + new /obj/item/weapon/reagent_containers/syringe( src ) + new /obj/item/weapon/reagent_containers/syringe( src ) + new /obj/item/weapon/reagent_containers/syringe( src ) /obj/item/weapon/storage/box/syringegun name = "box of syringe gun cartridges" desc = "A box full of compressed gas cartridges." icon_state = "syringe" -/obj/item/weapon/storage/box/syringes/fill() +/obj/item/weapon/storage/box/syringegun/fill() ..() new /obj/item/weapon/syringe_cartridge( src ) new /obj/item/weapon/syringe_cartridge( src ) @@ -509,7 +509,7 @@ /obj/item/weapon/storage/box/cups name = "box of paper cups" desc = "It has pictures of paper cups on the front." - + /obj/item/weapon/storage/box/cups/fill() ..() new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src ) @@ -554,7 +554,7 @@ icon = 'icons/obj/food.dmi' icon_state = "monkeycubebox" can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube) - + /obj/item/weapon/storage/box/monkeycubes/fill() ..() if(src.type == /obj/item/weapon/storage/box/monkeycubes) @@ -564,7 +564,7 @@ /obj/item/weapon/storage/box/monkeycubes/farwacubes name = "farwa cube box" desc = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/farwacubes/fill() ..() for(var/i = 1; i <= 5; i++) @@ -573,7 +573,7 @@ /obj/item/weapon/storage/box/monkeycubes/stokcubes name = "stok cube box" desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/stokcubes/fill() ..() for(var/i = 1; i <= 5; i++) @@ -582,7 +582,7 @@ /obj/item/weapon/storage/box/monkeycubes/neaeracubes name = "neaera cube box" desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!" - + /obj/item/weapon/storage/box/monkeycubes/neaeracubes/fill() ..() for(var/i = 1; i <= 5; i++) @@ -632,13 +632,13 @@ new /obj/item/weapon/handcuffs(src) new /obj/item/weapon/handcuffs(src) new /obj/item/weapon/handcuffs(src) - + /obj/item/weapon/storage/box/zipties name = "box of zipties" desc = "A box full of zipties." icon_state = "handcuff" -/obj/item/weapon/storage/box/handcuffs/fill() +/obj/item/weapon/storage/box/zipties/fill() ..() new /obj/item/weapon/handcuffs/ziptie(src) new /obj/item/weapon/handcuffs/ziptie(src) @@ -679,7 +679,7 @@ /obj/item/weapon/storage/box/spraybottles name = "box of spray bottles" desc = "It has pictures of spray bottles on its front." - + /obj/item/weapon/storage/box/spraybottles/fill() ..() new /obj/item/weapon/reagent_containers/spray( src ) @@ -696,12 +696,12 @@ icon = 'icons/obj/toy.dmi' icon_state = "spbox" can_hold = list(/obj/item/toy/snappop) - + /obj/item/weapon/storage/box/snappops/fill() ..() for(var/i=1; i <= 8; i++) new /obj/item/toy/snappop(src) - + /obj/item/weapon/storage/box/matches name = "matchbox" desc = "A small box of 'Space-Proof' premium matches." @@ -730,7 +730,7 @@ name = "box of injectors" desc = "Contains autoinjectors." icon_state = "syringe" - + /obj/item/weapon/storage/box/autoinjectors/fill() ..() for (var/i; i < 7; i++) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 5c359b3204b..fe9b50bc857 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -166,7 +166,7 @@ new /obj/item/device/spy_monitor(src) /obj/item/weapon/storage/box/syndie_kit/g9mm - name = "\improper Smooth operator" + name = "smooth operator" desc = "9mm with silencer kit." /obj/item/weapon/storage/box/syndie_kit/g9mm/fill() @@ -184,7 +184,7 @@ new /obj/item/weapon/reagent_containers/syringe(src) /obj/item/weapon/storage/box/syndie_kit/cigarette - name = "\improper Tricky smokes" + name = "tricky smokes" desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up." /obj/item/weapon/storage/box/syndie_kit/cigarette/fill() @@ -225,7 +225,7 @@ C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots) /obj/item/weapon/storage/box/syndie_kit/ewar_voice - name = "Electrowarfare and Voice Synthesiser kit" + name = "electrowarfare and voice synthesiser kit" desc = "Kit for confounding organic and synthetic entities alike." /obj/item/weapon/storage/box/syndie_kit/ewar_voice/fill() @@ -233,6 +233,13 @@ new /obj/item/rig_module/electrowarfare_suite(src) new /obj/item/rig_module/voice(src) +/obj/item/weapon/storage/box/syndie_kit/armor + name = "boxed armor kit" + +/obj/item/weapon/storage/box/syndie_kit/armor/fill() + ..() + new /obj/item/clothing/suit/storage/vest/merc(src) + new /obj/item/clothing/head/helmet/merc(src) /obj/item/weapon/storage/secure/briefcase/money name = "suspicious briefcase" diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 8748d7b61e5..4c857afb52f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -184,7 +184,7 @@ interface_name = "mounted pulse rifle" interface_desc = "A shoulder-mounted cell-powered pulse rifle." - gun_type = /obj/item/weapon/gun/energy/pulse + gun_type = /obj/item/weapon/gun/energy/pulse/mounted /obj/item/rig_module/mounted/smg diff --git a/code/modules/mob/living/devour.dm b/code/modules/mob/living/devour.dm index 9051325f895..b8dffeb0bba 100644 --- a/code/modules/mob/living/devour.dm +++ b/code/modules/mob/living/devour.dm @@ -273,7 +273,8 @@ /proc/is_valid_for_devour(var/mob/living/test, var/eat_types) //eat_types must contain all types that the mob has. For example we need both humanoid and synthetic to eat an IPC. - . = (test.find_type() & eat_types) == eat_types + var/test_types = test.find_type() + . = (eat_types & test_types) == test_types /mob/living/proc/calculate_composition() if (!composition_reagent)//if no reagent has been set, then we'll set one diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index a3618c9ea3f..430f9f4a8c2 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -94,6 +94,8 @@ if(isnull(scoped_accuracy)) scoped_accuracy = accuracy + queue_icon_update() + //Checks whether a given mob can use the gun //Any checks that shouldn't result in handle_click_empty() being called if they fail should go here. //Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there. diff --git a/html/changelog.html b/html/changelog.html index f0cd750fcf9..6fc21614852 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

07 August 2017

+

Lohikar updated:

+ +

05 August 2017

Alberyk updated: