diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index baf5d2e0c8f..02a47ea56e5 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -23,7 +23,7 @@ for(var/mob/M in mob_list) if (check_rights(R_ADMIN|R_MOD, 0, M)) - M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [get_options_bar(src, 0, 1, 1)](A HREF='?_src_=holder;adminplayerobservejump=[src.mob]>JMP): [msg]" + M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [get_options_bar(src, 0, 1, 1)](JMP): [msg]" else if (M.mind && M.mind.special_role && M.client) M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [display_name]: [msg]" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index f1e2644a225..de60ad65e37 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -123,7 +123,7 @@ /obj/item/clothing/gloves/red/tajara name = "red gloves" desc = "Red gloves made for Tajaran use." - species_restricted = list("Tajaran") + species_restricted = list("Tajara") /obj/item/clothing/gloves/blue/unathi name = "blue gloves" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 1eb0b53f04f..a196299fac8 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -34,7 +34,7 @@ handle_hud_list() //Handle species-specific deaths. - species.handle_death(src) + species.handle_death(src, gibbed) animate_tail_stop() //Handle brain slugs. diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 4971634a146..d5daff4a226 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -269,7 +269,7 @@ H.mob_swap_flags = swap_flags H.mob_push_flags = push_flags -/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns). +/datum/species/proc/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0) //Handles any species-specific death events (such as dionaea nymph spawns). return // Only used for alien plasma weeds atm, but could be used for Dionaea later. diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index fb3c9ec1ff1..dddf682abd9 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -224,8 +224,9 @@ H.gender = NEUTER return ..() -/datum/species/diona/handle_death(var/mob/living/carbon/human/H) - H.diona_split_into_nymphs(0) +/datum/species/diona/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0) + if (!gibbed) + H.diona_split_into_nymphs(0) /datum/species/machine name = "Machine" diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index c6ff8709881..62d14702ba5 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -55,7 +55,7 @@ if(is_train_head() && !on) return 0 - + //space check ~no flying space trains sorry if(on && istype(destination, /turf/space)) return 0 @@ -79,12 +79,13 @@ return ..() -//cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead +// Cargo trains are open topped, so you can shoot at the driver. +// Or you can shoot at the tug itself, if you're good. /obj/vehicle/train/cargo/bullet_act(var/obj/item/projectile/Proj) - if(buckled_mob && prob(70)) + if (buckled_mob && Proj.original == buckled_mob) buckled_mob.bullet_act(Proj) - return - ..() + else + ..() /obj/vehicle/train/cargo/update_icon() if(open) diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 556e82cd0c8..75b1328ef59 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -117,6 +117,10 @@ if (Proj.damage_type == BRUTE || Proj.damage_type == BURN) health -= Proj.damage ..() + + if (prob(20)) + PoolOrNew(/obj/effect/effect/sparks, loc) + healthcheck() /obj/vehicle/meteorhit() diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 7e892c57e2d..ee2657b0a4e 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -133,7 +133,7 @@ var/food_taken = min(food_needed, beaker.reagents.get_reagent_amount("virusfood")) beaker.reagents.remove_reagent("virusfood", food_taken) - foodsupply = min(100, food_taken * 2) + foodsupply = min(100, foodsupply + (food_taken * 2)) nanomanager.update_uis(src) diff --git a/html/Skull132_Age_Restrictions.yml b/html/Skull132_Age_Restrictions.yml deleted file mode 100644 index f33295eeedc..00000000000 --- a/html/Skull132_Age_Restrictions.yml +++ /dev/null @@ -1,13 +0,0 @@ -author: Skull132 - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Age restrictions for all jobs and antags are now implemented again with config options." - - tweak: "You are now prompted to confirm whether or not you want to delete a character." diff --git a/html/changelog.html b/html/changelog.html index 55383cda02e..b28eba2bd6b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
+

20 July 2016

+

Skull132 updated:

+ +

18 July 2016

Alberyk updated: