diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 6d57a6808d..511731195e 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" @@ -238,13 +241,13 @@ datum/mind if(istype(current, /mob/living/carbon/human)) if (H.is_loyalty_implanted(H)) text +="traitor|LOYAL EMPLOYEE" - else - if (src in ticker.mode.traitors) - text += "TRAITOR|Employee" - if (objectives.len==0) - text += "
Objectives are empty! Randomize!" else - text += "traitor|Employee" + if (src in ticker.mode.traitors) + text += "TRAITOR|Employee" + if (objectives.len==0) + text += "
Objectives are empty! Randomize!" + else + text += "traitor|Employee" sections["traitor"] = text /** MONKEY ***/ diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 2ca53be3ee..12db8fc376 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -199,6 +199,27 @@ name = "agent card" access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) origin_tech = "syndicate=3" + var/registered_user=null + +/obj/item/weapon/card/id/syndicate/New(mob/user as mob) + ..() + var/t = reject_bad_name(input(user, "What name would you like to put on this card?\nNode: You can change this later by clicking on the ID card while it's in your hand.", "Agent card name", ishuman(user) ? user.real_name : user.name)) + if(!t) + alert("Invalid name.") + if(!registered_name) + registered_name = ishuman(user) ? user.real_name : user.name + else + registered_name = t + var/u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Assistant")),1,MAX_MESSAGE_LEN) + if(!u) + alert("Invalid assignment.") + assignment = "Assistant" + else + assignment = u + name = "[registered_name]'s ID Card ([assignment])" + user << "\blue You successfully forge the ID card." + registered_user = user + /obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity) if(!proximity) return @@ -209,7 +230,6 @@ if(user.mind.special_role) usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access." -/obj/item/weapon/card/id/syndicate/var/mob/registered_user = null /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak @@ -228,7 +248,10 @@ src.name = "[src.registered_name]'s ID Card ([src.assignment])" user << "\blue You successfully forge the ID card." registered_user = user - else if(registered_user == user) + else if(!registered_user || registered_user == user) + + if(!registered_user) registered_user = user // First one to pick it up is the owner if there is ever a wild case New() doens't work. + switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show")) if("Rename") var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index cd8b5420c1..036c57b003 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -97,7 +97,7 @@ "/obj/item/device/flashlight/pen", "/obj/item/clothing/mask/surgical", "/obj/item/clothing/gloves/latex", - "/obj/item/weapon/reagent_containers/hypospray/autoinjector" + "/obj/item/weapon/reagent_containers/hypospray" ) @@ -166,4 +166,4 @@ name = "inflatable duck" desc = "No bother to sink or swim when you can just float!" icon_state = "inflatable" - item_state = "inflatable" \ No newline at end of file + item_state = "inflatable" 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/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 595dd03ad3..efcefab52e 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2821,8 +2821,8 @@ datum if (adj_drowsy) M.drowsyness = max(0,M.drowsyness + adj_drowsy) if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy) - if(!src.data) data = 1 - src.data += boozepwr + if(!src.data || (!isnum(src.data) && src.data.len)) data = 1 //if it doesn't exist we set it. if it's a list we're going to set it to 1 as well. This is to + src.data += boozepwr //avoid a runtime error associated with drinking blood mixed in drinks (demon's blood). var/d = data @@ -3370,7 +3370,6 @@ datum description = "AHHHH!!!!" color = "#820000" // rgb: 130, 0, 0 boozepwr = 3 - ethanol/vodkatonic name = "Vodka and Tonic" id = "vodkatonic" diff --git a/html/changelog.html b/html/changelog.html index 1a910ed385..1a33e6090e 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. @@ -56,6 +56,18 @@ 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.
  • +
+
+

24 November 2013

Yinadele updated:

@@ -77,7 +89,7 @@ should be listed in the changelog upon commit though. Thanks. -->
  • Please wait warmly, new features planned for next merge!
  • - +

    29 October 2013

    Cael_Aislinn updated: