diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 6d57a6808d..82a26dab65 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -126,17 +126,20 @@ datum/mind var/mob/living/carbon/human/H = current if (istype(current, /mob/living/carbon/human) || istype(current, /mob/living/carbon/monkey)) /** Impanted**/ - if(H.is_loyalty_implanted(H)) - text = "Loyalty Implant:Remove|Implanted
" + if(istype(current, /mob/living/carbon/human)) + if(H.is_loyalty_implanted(H)) + text = "Loyalty Implant:Remove|Implanted
" + else + text = "Loyalty Implant:No Implant|Implant him!
" else - text = "Loyalty Implant:No Implant|Implant him!
" + text = "Loyalty Implant: Don't implant that monkey!
" sections["implant"] = text /** REVOLUTION ***/ text = "revolution" if (ticker.mode.config_tag=="revolution") text += uppertext(text) text = "[text]: " - if (H.is_loyalty_implanted(H)) + if (istype(current, /mob/living/carbon/monkey) || H.is_loyalty_implanted(H)) text += "LOYAL EMPLOYEE|headrev|rev" else if (src in ticker.mode.head_revolutionaries) text = "employee|HEADREV|rev" @@ -166,7 +169,7 @@ datum/mind if (ticker.mode.config_tag=="cult") text = uppertext(text) text = "[text]: " - if (H.is_loyalty_implanted(H)) + if (istype(current, /mob/living/carbon/monkey) || H.is_loyalty_implanted(H)) text += "LOYAL EMPLOYEE|cultist" else if (src in ticker.mode.cult) text += "employee|CULTIST" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 13c1a0888f..2971e0f88f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -194,6 +194,11 @@ playsound(user, fire_sound, 10, 1) else playsound(user, fire_sound, 50, 1) + if(istype(in_chamber, /obj/item/projectile/beam/lastertag)) + user.show_message("You feel rather silly, trying to commit suicide with a toy.") + mouthshoot = 0 + return + in_chamber.on_hit(M) if (in_chamber.damage_type != HALLOSS) user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]") diff --git a/html/changelog.html b/html/changelog.html index b283883543..53a22bcdf8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,7 +35,7 @@ Header Section
- Code: Abi79, Aryn, Cael_Aislinn, Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexusjjss, Melonstorm, Miniature, Mloc, NerdyBoy1104, SkyMarshal, Snapshot, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty
 + Code: Abi79, Aryn, Cael_Aislinn, Ccomp5950,Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexusjjss, Melonstorm, Miniature, Mloc, NerdyBoy1104, SkyMarshal, Snapshot, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty
 Sprites: Apple_Master, Arcalane, Chinsky, CompactNinja, Deus Dactyl, Erthilo, Flashkirby, Miniature, Searif, Xenone, faux
 Sounds: Aryn
 Thanks To: /tg/ station, Goonstation, Animus Station, Daedalus, and original Spacestation 13 devs. Skibiliano for the IRC bot. @@ -55,7 +55,25 @@ should be listed in the changelog upon commit though. Thanks. --> + + +
+ +

23 November 2013

+

Ccomp5950 updated:

+
    +
  • Players are now no longer able to commit suicide with a lasertag gun, and will feel silly for doing so.
    • +
  • Ghosts hit with the cult book shall now actually become visible.
    • +
  • The powercells spawned with Exosuits will now properly be named to not confuse bearded roboticists.
    • +
  • Blindfolded players will now no longer require eye surgery to repair their sight, removing the blindfold will be sufficient.
    • +
  • Atmospheric Technicians will now have access to Exterior airlocks.
    • +
+
+ +
+ +

29 October 2013

Cael_Aislinn updated:

    @@ -65,9 +83,7 @@ should be listed in the changelog upon commit though. Thanks. -->
- -
-

06 Derptomber 2013

+

06 Derptomber 2013

Chinsky updated:

  • Added contact-spread viruses. Spread if infected guy touches someone with bare hands, or if someone touches bare infected guy. Biosuits/gloves help.