" dat += "Slab of meat ([round(50/build_eff)])
" dat += "Nutrient
" - dat += "E-Z-Nutrient ([round(10/build_eff)]) | x5
" - dat += "Left 4 Zed ([round(20/build_eff)]) | x5
" - dat += "Robust Harvest ([round(25/build_eff)]) | x5
" + dat += "E-Z-Nutrient ([round(60/build_eff)]) | x5
" + dat += "Left 4 Zed ([round(120/build_eff)]) | x5
" + dat += "Robust Harvest ([round(150/build_eff)]) | x5
" dat += "Leather
" dat += "Wallet ([round(100/build_eff)])
" dat += "Botanical gloves ([round(250/build_eff)])
" diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index bf7bd30ab1..b101bab0ee 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -222,6 +222,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() /mob/observer/dead var/datum/exonet_protocol/exonet = null + var/list/exonet_messages = list() // Proc: New() // Parameters: None @@ -305,6 +306,10 @@ var/global/list/obj/item/device/communicator/all_communicators = list() if(comm.exonet) im_contacts_ui[++im_contacts_ui.len] = list("name" = sanitize(comm.name), "address" = comm.exonet.address, "ref" = "\ref[comm]") + for(var/mob/observer/dead/ghost in im_contacts) + if(ghost.exonet) + im_contacts_ui[++im_contacts_ui.len] = list("name" = sanitize(ghost.name), "address" = ghost.exonet.address, "ref" = "\ref[ghost]") + //Actual messages. for(var/I in im_list) im_list_ui[++im_list_ui.len] = list("address" = I["address"], "to_address" = I["to_address"], "im" = I["im"]) @@ -411,6 +416,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() if(text) exonet.send_message(their_address, "text", text) im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text)) + log_pda("[usr] (COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]") if(href_list["disconnect"]) var/name_to_disconnect = href_list["disconnect"] @@ -493,7 +499,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() // Proc: receive_exonet_message() // Parameters: 3 (origin atom - the source of the message's holder, origin_address - where the message came from, message - the message received) // Description: Handles voice requests and invite messages originating from both real communicators and ghosts. Also includes a ping response. -/mob/observer/dead/receive_exonet_message(origin_atom, origin_address, message) +/mob/observer/dead/receive_exonet_message(origin_atom, origin_address, message, text) if(message == "voice") if(istype(origin_atom, /obj/item/device/communicator)) var/obj/item/device/communicator/comm = origin_atom @@ -508,7 +514,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list() var/random = rand(450,700) random = random / 10 exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms") - if(message == "text") //Ghosts don't get texting yet. Mostly for spam prevention by ghosts but also due to ui requirements not sorted out yet. + if(message == "text") + src << "\icon[origin_atom] Received text message from [origin_atom]: \"[text]\"" + exonet_messages.Add("From [origin_atom]:
[text]") return // Proc: register_device() @@ -533,7 +541,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() communicating |= comm listening_objects |= src update_icon() - + // Proc: del_communicating() // Parameters: 1 (comm - the communicator to remove from communicating) // Description: Used when this communicator is being asked to stop relaying say/me messages to another @@ -732,7 +740,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list() /obj/item/device/communicator/proc/request_im(var/atom/candidate, var/origin_address, var/text) var/who = null if(isobserver(candidate)) - return + var/mob/observer/dead/ghost = candidate + who = ghost + im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text)) else if(istype(candidate, /obj/item/device/communicator)) var/obj/item/device/communicator/comm = candidate who = comm.owner @@ -811,7 +821,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() if(!T) return var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display var/list/mobs_to_relay = in_range["mobs"] - + for(var/mob/mob in mobs_to_relay) //We can't use visible_message(), or else we will get an infinite loop if two communicators hear each other. var/dst = get_dist(get_turf(mob),get_turf(comm)) if(dst <= video_range) @@ -827,7 +837,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() // Description: Relays the speech to all linked communicators. /obj/item/device/communicator/hear_talk(mob/living/M, text, verb, datum/language/speaking) for(var/obj/item/device/communicator/comm in communicating) - + var/turf/T = get_turf(comm) if(!T) return var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) @@ -915,6 +925,71 @@ var/global/list/obj/item/device/communicator/all_communicators = list() src << "A communications request has been sent to [chosen_communicator]. Now you need to wait until someone answers." +// Verb: text_communicator() +// Parameters: None +// Description: Allows a ghost to send a text message to a communicator. +/mob/observer/dead/verb/text_communicator() + set category = "Ghost" + set name = "Text Communicator" + set desc = "If there is a communicator available, send a text message to it." + + if(ticker.current_state < GAME_STATE_PLAYING) + src << "The game hasn't started yet!" + return + + if (!src.stat) + return + + if (usr != src) + return //something is terribly wrong + + for(var/mob/living/L in mob_list) //Simple check so you don't have dead people calling. + if(src.client.prefs.real_name == L.real_name) + src << "Your identity is already present in the game world. Please load in a different character first." + return + + var/obj/machinery/exonet_node/E = get_exonet_node() + if(!E || !E.on || !E.allow_external_communicators) + src << "The Exonet node at telecommunications is down at the moment, or is actively blocking you, so your call can't go through." + return + + var/list/choices = list() + for(var/obj/item/device/communicator/comm in all_communicators) + if(!comm.network_visibility || !comm.exonet || !comm.exonet.address) + continue + choices.Add(comm) + + if(!choices.len) + src << "There are no available communicators, sorry." + return + + var/choice = input(src,"Send a text message to whom?") as null|anything in choices + if(choice) + var/obj/item/device/communicator/chosen_communicator = choice + var/mob/observer/dead/O = src + var/text_message = sanitize(input(src, "What do you want the message to say?")) as message + if(text_message && O.exonet) + O.exonet.send_message(chosen_communicator.exonet.address, "text", text_message) + + src << "You have sent '[text_message]' to [chosen_communicator].." + exonet_messages.Add("To [chosen_communicator]:
[text_message]") + log_pda("[usr] (COMM: [src]) sent \"[text_message]\" to [chosen_communicator]") + + +// Verb: show_text_messages() +// Parameters: None +// Description: Lets ghosts review messages they've sent or received. +/mob/observer/dead/verb/show_text_messages() + set category = "Ghost" + set name = "Show Text Messages" + set desc = "Allows you to see exonet text messages you've sent and received." + + var/HTML = "
" + HTML +="" + usr << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") + // Proc: connect_video() // Parameters: user - the mob doing the viewing of video, comm - the communicator at the far end // Description: Sets up a videocall and puts the first view into it using watch_video, and updates the icon @@ -963,7 +1038,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list() // Description: Cleans up mob's client when they stop watching a video /obj/item/device/communicator/proc/video_cleanup(mob/user) if(!user) return - + user.reset_view(null) user.unset_machine() @@ -972,14 +1047,14 @@ var/global/list/obj/item/device/communicator/all_communicators = list() // Description: Ends the video call by clearing video_source /obj/item/device/communicator/proc/end_video(var/reason) video_source = null - + . = "\icon[src] [reason ? reason : "Video session ended"]." - + visible_message(.) update_icon() //For synths who have no hands. -/obj/item/device/communicator/integrated +/obj/item/device/communicator/integrated name = "integrated communicator" desc = "A circuit used for long-range communications, able to be integrated into a system." diff --git a/code/game/objects/items/devices/telecrystal.dm b/code/game/objects/items/devices/telecrystal.dm deleted file mode 100644 index 0d2c71384b..0000000000 --- a/code/game/objects/items/devices/telecrystal.dm +++ /dev/null @@ -1,20 +0,0 @@ -/* -Telecrystal item -Does nothing if not suitable antag type, checks for accept_tcrystals = 1 in a mob's mind. -For new antags, make sure to add "player.mind.accept_tcrystals = 1" if you want tradable tcrystals. -*/ -/obj/item/device/telecrystal - name = "red crystal" - desc = "A strange, red, glowing crystal." - icon = 'icons/obj/stock_parts.dmi' - icon_state = "telecrystal" - force = 5 - origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 1, TECH_ILLEGAL = 1) - -/obj/item/device/telecrystal/attack_self(mob/user as mob) - if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals - user.mind.tcrystals += 1 - user.drop_from_inventory(src) - qdel(src) - return - \ No newline at end of file diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm new file mode 100644 index 0000000000..2682361d2c --- /dev/null +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -0,0 +1,29 @@ +/obj/item/stack/telecrystal + name = "telecrystal" + desc = "It seems to be pulsing with suspiciously enticing energies." + description_antag = "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks." + singular_name = "telecrystal" + icon = 'icons/obj/stock_parts.dmi' + icon_state = "telecrystal" + w_class = 1 + max_amount = 240 + flags = NOBLUDGEON + origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) + +/obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity) + if(!proximity) + return + if(istype(I, /obj/item)) + if(I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up. + I.hidden_uplink.uses += amount + I.hidden_uplink.update_nano_data() + nanomanager.update_uis(I.hidden_uplink) + use(amount) + user << "You slot \the [src] into \the [I] and charge its internal uplink." + +/obj/item/stack/telecrystal/attack_self(mob/user as mob) + if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals + user << "You use \the [src], adding [src.amount] to your balance." + user.mind.tcrystals += amount + use(amount) + return \ No newline at end of file diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 47343ffa0f..743175a21b 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -69,7 +69,6 @@ icon_state = "emag" item_state = "card-id" origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2) - var/default_uses = 10 var/uses = 10 /obj/item/weapon/card/emag/resolve_attackby(atom/A, mob/user) @@ -89,9 +88,15 @@ qdel(src) return 1 + /obj/item/weapon/card/emag/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/device/telecrystal)) - src.uses += default_uses/2 //Adds half the default amount of uses which is more than you get per TC when buying, as to balance the utility of having multiple emags vs one heavily usable one + if(istype(O, /obj/item/stack/telecrystal)) + var/obj/item/stack/telecrystal/T = O + if(T.amount < 1) + usr << "You are not adding enough telecrystals to fuel \the [src]." + return + uses += T.amount/2 //Gives 5 uses per 10 TC + uses = ceil(uses) //Ensures no decimal uses nonsense, rounds up to be nice usr << "You add \the [O] to \the [src]. Increasing the uses of \the [src] to [uses]." qdel(O) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 604a4e83ac..0d88c2b3aa 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -38,6 +38,22 @@ icon = 'icons/obj/weapons.dmi' icon_state = "unathiknife" attack_verb = list("ripped", "torn", "cut") + var hits = 0 + +/obj/item/weapon/material/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob) + if(hits > 0) + return + var/obj/item/I = user.get_inactive_hand() + if(istype(I, /obj/item/weapon/material/hatchet/unathiknife)) + hits ++ + var/obj/item/weapon/W = I + W.attack(M, user) + W.afterattack(M, user) + ..() + +/obj/item/weapon/material/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob) + hits = initial(hits) + ..() /obj/item/weapon/material/hatchet/tacknife name = "tactical knife" diff --git a/code/hub.dm b/code/hub.dm index a9d8b0c7d7..9bd4fae1d8 100644 --- a/code/hub.dm +++ b/code/hub.dm @@ -1,8 +1,8 @@ /world hub = "Exadv1.spacestation13" - hub_password = "SORRYNOPASSWORD" - //hub_password = "kMZy3U5jJHSiBQjr" + //hub_password = "SORRYNOPASSWORD" + hub_password = "kMZy3U5jJHSiBQjr" name = "Space Station 13" /* This is for any host that would like their server to appear on the main SS13 hub. diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index fc72bc1611..0962d54061 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -287,6 +287,7 @@ 'html/panels.css', 'html/images/loading.gif', 'html/images/ntlogo.png', + 'html/images/sglogo.png', 'html/images/talisman.png', 'icons/pda_icons/pda_atmos.png', 'icons/pda_icons/pda_back.png', diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index a2635ef79c..4ad804dccd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -31,6 +31,21 @@ path = /obj/item/clothing/head/beret/sec/navy/hos allowed_roles = list("Head of Security") +/datum/gear/head/beret/csec + display_name = "beret, corporate (officer)" + path = /obj/item/clothing/head/beret/sec/corporate/officer + allowed_roles = list("Security Officer","Head of Security","Warden") + +/datum/gear/head/beret/csec_warden + display_name = "beret, corporate (warden)" + path = /obj/item/clothing/head/beret/sec/corporate/warden + allowed_roles = list("Head of Security","Warden") + +/datum/gear/head/beret/csec_hos + display_name = "beret, corporate (hos)" + path = /obj/item/clothing/head/beret/sec/corporate/hos + allowed_roles = list("Head of Security") + /datum/gear/head/beret/eng display_name = "beret, engie-orange" path = /obj/item/clothing/head/beret/engineering diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 1b9329679e..5134f48b3f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -283,4 +283,8 @@ /datum/gear/suit/flannel/aqua display_name = "aqua flannel" - path = /obj/item/clothing/suit/storage/flannel/aqua \ No newline at end of file + path = /obj/item/clothing/suit/storage/flannel/aqua + +/datum/gear/suit/flannel/brown + display_name = "brown flannel" + path = /obj/item/clothing/suit/storage/flannel/brown \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 31f3d36c3e..1bebc08ab9 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -704,6 +704,7 @@ icon_state += "t" if(buttoned) icon_state += "b" + update_clothing_icon() /obj/item/clothing/suit/storage/flannel/red desc = "A comfy, red flannel shirt. Unleash your inner hipster." @@ -715,6 +716,11 @@ icon_state = "flannel_aqua" item_state = "blue_labcoat" +/obj/item/clothing/suit/storage/flannel/brown + desc = "A comfy, brown flannel shirt. Unleash your inner hipster." + icon_state = "flannel_brown" + item_state = "johnny" + //Green Uniform /obj/item/clothing/suit/storage/toggle/greengov diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ccf700a278..c1926cb71a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1328,13 +1328,11 @@ var/obj/item/organ/external/current_limb = organs_by_name[limb] if(current_limb && current_limb.dislocated > 0 && !current_limb.is_parent_dislocated()) //if the parent is also dislocated you will have to relocate that first limbs |= current_limb - var/choice = input(usr,"Which joint do you wish to relocate?") as null|anything in limbs + var/obj/item/organ/external/current_limb = input(usr,"Which joint do you wish to relocate?") as null|anything in limbs - if(!choice) + if(!current_limb) return - var/obj/item/organ/external/current_limb = organs_by_name[choice] - if(self) src << "You brace yourself to relocate your [current_limb.joint]..." else @@ -1342,7 +1340,7 @@ if(!do_after(U, 30)) return - if(!choice || !current_limb || !S || !U) + if(!current_limb || !S || !U) return if(self) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index 43113739c4..ebb16683a8 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -18,9 +18,6 @@ ExtinguishMob() return TRUE - if(..()) - return TRUE - if(handcuffed) spawn() escape_handcuffs() else if(legcuffed) @@ -59,8 +56,8 @@ "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)" ) - if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED)) - if(!handcuffed || buckled) + if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DISABLED & INCAPACITATION_KNOCKDOWN)) + if(!handcuffed) return visible_message( "\The [src] manages to remove \the [handcuffed]!", diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index bb4a9d1a23..1e85563ee8 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -260,6 +260,7 @@ t = replacetext(t, "\[row\]", "
")
+ t = replacetext(t, "\[sglogo\]", "
")
t = "[t]"
else // If it is a crayon, and he still tries to use these, make them empty!
@@ -274,6 +275,7 @@
t = replacetext(t, "\[row\]", "")
t = replacetext(t, "\[cell\]", "")
t = replacetext(t, "\[logo\]", "")
+ t = replacetext(t, "\[sglogo\]", "")
t = "[t]"
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index f37cdce706..232936484c 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -56,6 +56,10 @@
name = "quartermaster's stamp"
icon_state = "stamp-qm"
+/obj/item/weapon/stamp/solgov
+ name = "solgov stamp"
+ icon_state = "stamp-sg"
+
// Syndicate stamp to forge documents.
/obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 715adbf7d6..5d40077635 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -636,25 +636,16 @@
if(alien == IS_DIONA)
return
..()
- if(alien == IS_TAJARA)
- M.adjustToxLoss(0.5 * removed)
- M.make_jittery(4) //extra sensitive to caffine
+
if(adj_temp > 0)
holder.remove_reagent("frostoil", 10 * removed)
/datum/reagent/nutriment/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
- if(alien == IS_TAJARA)
- M.adjustToxLoss(2 * removed)
- M.make_jittery(4)
- return
/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien)
if(alien == IS_DIONA)
return
- if(alien == IS_TAJARA)
- M.adjustToxLoss(4 * REM)
- M.apply_effect(3, STUTTER)
M.make_jittery(5)
/datum/reagent/drink/coffee/icecoffee
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index bede5263e2..ff5682fedd 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -164,20 +164,14 @@
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if(..())
- var/obj/item/stack/cable_coil/C = tool
var/obj/item/organ/external/affected = target.get_organ(target_zone)
-
- var/limb_can_operate = (affected && affected.open == 2 && affected.burn_dam > 0 && target_zone != "mouth")
-
- if(!limb_can_operate)
- return 0
-
- if(istype(C))
+ if(istype(tool,/obj/item/stack/cable_coil/))
+ var/obj/item/stack/cable_coil/C = tool
if(!C.can_use(10))
user << "You need ten or more cable pieces to repair this damage." //usage amount made more consistent with regular cable repair
return SURGERY_FAILURE
C.use(10)
- return 1
+ return affected && affected.open == 3 && (affected.disfigured || affected.burn_dam > 0) && target_zone != O_MOUTH
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
diff --git a/html/changelog.html b/html/changelog.html
index 8e2b5c1cbf..311053cf2c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,35 @@
-->
+
22 July 2016
+Anewbe updated:
+-
+
- Removes assault carbine from uplink. +
- Speeds up the toxin reagents +
EmperorJon updated:
+-
+
- Having between 20 and 100 nutrition and over 45 toxin damage will no longer cause you to gag ad-infinitum and die. It now respects vomit time restraints. +
- Gagging now occurs only when the mob has no nutrition at all. It no longer causes three toxin damage, only weakens as before. +
- Vomiting and/or gagging from toxins now occurs regardless of nutrition, not only 20+. +
Yoshax updated:
+-
+
- Repairing burn damage on FBPs will now once again properly work. +
- Undislocating limbs will now once again properly work. +
Neerti updated:
+-
+
- Adds ability for ghosts to send and receive text messages via communicator. +
Yoshax updated:
+-
+
- Drop pod contents have been adjusted. In general, you will get something more useful and the less useful contents have been made more interesting. There is a total of 12 drop pod content lists and 7/12 are useful, 4/12 are useless, 1/12 is potentially useful. +
- Stun Revolvers will no longer be able to spawn from random energy weapon spawns. In addition, some of the other random item spawns have new items and adjusted probablities. +
- Tajaran are no longer negatively affected by coffee. +
- Bucklecuffing as it has been known for the longest time is no longer a thing. When you resist when cuffed and buckled to something, you will now resist out of the handcuffs first, allowing you to simply unbuckle yourself once done. +
13 July 2016
Anewbe updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d3a0568242..be34f6a2e0 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2538,3 +2538,31 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
added to mobs.
xDarkSapphire:
- rscadd: 'Adds a new hairstyle: Spiky Ponytail.'
+2016-07-22:
+ Anewbe:
+ - rscdel: Removes assault carbine from uplink.
+ - tweak: Speeds up the toxin reagents
+ EmperorJon:
+ - bugfix: Having between 20 and 100 nutrition and over 45 toxin damage will no longer
+ cause you to gag ad-infinitum and die. It now respects vomit time restraints.
+ - tweak: Gagging now occurs only when the mob has no nutrition at all. It no longer
+ causes three toxin damage, only weakens as before.
+ - tweak: Vomiting and/or gagging from toxins now occurs regardless of nutrition,
+ not only 20+.
+ Yoshax:
+ - bugfix: Repairing burn damage on FBPs will now once again properly work.
+ - bugfix: Undislocating limbs will now once again properly work.
+ Neerti:
+ - rscadd: Adds ability for ghosts to send and receive text messages via communicator.
+ Yoshax:
+ - tweak: Drop pod contents have been adjusted. In general, you will get something
+ more useful and the less useful contents have been made more interesting. There
+ is a total of 12 drop pod content lists and 7/12 are useful, 4/12 are useless,
+ 1/12 is potentially useful.
+ - tweak: Stun Revolvers will no longer be able to spawn from random energy weapon
+ spawns. In addition, some of the other random item spawns have new items and
+ adjusted probablities.
+ - rscdel: Tajaran are no longer negatively affected by coffee.
+ - tweak: Bucklecuffing as it has been known for the longest time is no longer a
+ thing. When you resist when cuffed and buckled to something, you will now resist
+ out of the handcuffs first, allowing you to simply unbuckle yourself once done.
diff --git a/html/changelogs/EmperorJon - Vomit.yml b/html/changelogs/EmperorJon - Vomit.yml
deleted file mode 100644
index 0edc82b457..0000000000
--- a/html/changelogs/EmperorJon - Vomit.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Your name.
-author: EmperorJon
-
-# 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:
- - bugfix: "Having between 20 and 100 nutrition and over 45 toxin damage will no longer cause you to gag ad-infinitum and die. It now respects vomit time restraints."
- - tweak: "Gagging now occurs only when the mob has no nutrition at all. It no longer causes three toxin damage, only weakens as before."
- - tweak: "Vomiting and/or gagging from toxins now occurs regardless of nutrition, not only 20+."
diff --git a/html/changelogs/Yoshax - Droppods.yml b/html/changelogs/Yoshax - Droppods.yml
deleted file mode 100644
index 8ec8ac4d9b..0000000000
--- a/html/changelogs/Yoshax - Droppods.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Your name.
-author: Yoshax
-
-# 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:
- - tweak: "Drop pod contents have been adjusted. In general, you will get something more useful and the less useful contents have been made more interesting. There is a total of 12 drop pod content lists and 7/12 are useful, 4/12 are useless, 1/12 is potentially useful."
diff --git a/html/changelogs/Yoshax - RandomItems.yml b/html/changelogs/Yoshax - RandomItems.yml
deleted file mode 100644
index e462ae02b5..0000000000
--- a/html/changelogs/Yoshax - RandomItems.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Your name.
-author: Yoshax
-
-# 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:
- - tweak: "Stun Revolvers will no longer be able to spawn from random energy weapon spawns. In addition, some of the other random item spawns have new items and adjusted probablities."
diff --git a/html/changelogs/anewbe.yml b/html/changelogs/anewbe.yml
deleted file mode 100644
index c14a1dcc6c..0000000000
--- a/html/changelogs/anewbe.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# maptweak
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: Anewbe
-
-# 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:
- - rscdel: "Removes assault carbine from uplink."
diff --git a/html/changelogs/toxins.yml b/html/changelogs/toxins.yml
deleted file mode 100644
index 2d425f6bd6..0000000000
--- a/html/changelogs/toxins.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-+################################
-+# Example Changelog File
-+#
-+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-+#
-+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-+# When it is, any changes listed below will disappear.
-+#
-+# Valid Prefixes:
-+# bugfix
-+# wip (For works in progress)
-+# tweak
-+# soundadd
-+# sounddel
-+# rscadd (general adding of nice things)
-+# rscdel (general deleting of nice things)
-+# imageadd
-+# imagedel
-+# maptweak
-+# spellcheck (typo fixes)
-+# experiment
-+#################################
-+
-+# Your name.
-+author: Anewbe
-+
-+# 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:
-+ - tweak: "Speeds up the toxin reagents"
\ No newline at end of file
diff --git a/html/images/sglogo.png b/html/images/sglogo.png
new file mode 100644
index 0000000000..930a0c4a5e
Binary files /dev/null and b/html/images/sglogo.png differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index ce6bb0c797..99f9bfd2e7 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/screen_spells.dmi b/icons/mob/screen_spells.dmi
index a6b56343de..a1a480a50a 100644
Binary files a/icons/mob/screen_spells.dmi and b/icons/mob/screen_spells.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index dda796e49b..3abe70cbef 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 388575deb1..8b95d91293 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index fe78cc348d..a5a4767b91 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 9d35c3d670..2fe02d970e 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/paper.dmi b/icons/obj/paper.dmi
index 5402b92829..0d5ca3e4e7 100644
Binary files a/icons/obj/paper.dmi and b/icons/obj/paper.dmi differ
diff --git a/icons/obj/spells.dmi b/icons/obj/spells.dmi
index d6b53c1c5c..3f4572f61c 100644
Binary files a/icons/obj/spells.dmi and b/icons/obj/spells.dmi differ
diff --git a/maps/polaris-2.dmm b/maps/polaris-2.dmm
index 97326effed..a9f68d2953 100644
--- a/maps/polaris-2.dmm
+++ b/maps/polaris-2.dmm
@@ -2630,7 +2630,7 @@
"aYD" = (/obj/structure/sign/double/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
"aYE" = (/obj/machinery/computer/message_monitor,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
"aYF" = (/obj/machinery/computer/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
-"aYG" = (/obj/structure/table/steel_reinforced,/obj/item/device/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
+"aYG" = (/obj/structure/table/steel_reinforced,/obj/item/stack/telecrystal,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
"aYH" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
"aYI" = (/obj/structure/table/steel_reinforced,/obj/item/clothing/head/philosopher_wig,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
"aYJ" = (/obj/structure/flora/pottedplant{tag = "icon-plant-04"; icon_state = "plant-04"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station)
@@ -2745,7 +2745,7 @@
"baO" = (/obj/machinery/computer/teleporter,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
"baP" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
"baQ" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station)
-
+
(1,1,1) = {"
aaaaabaacaadaaeaafaagaahaaaaaiaajaakaalaamaanaaoaagaafaajaacaadaahaakaaeaamaaiaaoaalaahaajaapaaqaaraasaataauaavaawaaxaayaaaaabaacaadaaeaafaagaahaaaaaiaajaakaalaamaanaaoaagaafaajaacaadaahaakaazaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaaKaaLaaMaaNaaOaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaazaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaR
aajaaTaaUaaVaaWaaXaaYaaZabaabbabcabdabeabfabgabhaaYaaXabcaaUaaVaaZabdaaWabfabbabhabeaaZabcaabaauaavaawabiabjabkablabmabeaaXabfaaZabcabbabhabeaaXabfaaZabcabbabhabhabeaaXabfaaZabcabbabhabhabmaazaaEabnaboabpaaqaaraasaataauaavaawabiabjabkablabqabnaboabpaaqaaraasaataauaaNaazaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaQabrabsaaQabrabsaaQabrabsaaQabrabsaaQaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPabtabuabuabuabvabuabuabuabuabuabuabwabxabyabxabyabxabxabyabxabyabxabwabzabAabAabAabAabAabAabAabAabAabwabBabCabDabDabDabDabDabDabDabDabwabEabEabEabEabEabEabEabEabEabEabwabFabFabFabFabFabFabFabFabFabFabwabGabHabIabJabKabKabKabKabKabLabM
@@ -3003,3 +3003,4 @@ aquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaquaq
aaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaP
aaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaP
"}
+
diff --git a/polaris.dme b/polaris.dme
index d9dd2cdcaa..af9a1e0a46 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -230,6 +230,7 @@
#include "code\datums\uplink\medical.dm"
#include "code\datums\uplink\stealth_items.dm"
#include "code\datums\uplink\stealthy_weapons.dm"
+#include "code\datums\uplink\telecrystals.dm"
#include "code\datums\uplink\tools.dm"
#include "code\datums\uplink\uplink_categories.dm"
#include "code\datums\uplink\uplink_items.dm"
@@ -416,7 +417,9 @@
#include "code\game\gamemodes\technomancer\technomancer.dm"
#include "code\game\gamemodes\technomancer\assistance\assistance.dm"
#include "code\game\gamemodes\technomancer\assistance\golem.dm"
+#include "code\game\gamemodes\technomancer\devices\boots_of_speed.dm"
#include "code\game\gamemodes\technomancer\devices\disposable_teleporter.dm"
+#include "code\game\gamemodes\technomancer\devices\gloves_of_regen.dm"
#include "code\game\gamemodes\technomancer\devices\hypos.dm"
#include "code\game\gamemodes\technomancer\devices\shield_armor.dm"
#include "code\game\gamemodes\technomancer\devices\tesla_armor.dm"
@@ -430,6 +433,7 @@
#include "code\game\gamemodes\technomancer\spells\dispel.dm"
#include "code\game\gamemodes\technomancer\spells\energy_siphon.dm"
#include "code\game\gamemodes\technomancer\spells\flame_tongue.dm"
+#include "code\game\gamemodes\technomancer\spells\gambit.dm"
#include "code\game\gamemodes\technomancer\spells\illusion.dm"
#include "code\game\gamemodes\technomancer\spells\instability_tap.dm"
#include "code\game\gamemodes\technomancer\spells\mark_recall.dm"
@@ -441,6 +445,8 @@
#include "code\game\gamemodes\technomancer\spells\resurrect.dm"
#include "code\game\gamemodes\technomancer\spells\shared_burden.dm"
#include "code\game\gamemodes\technomancer\spells\shield.dm"
+#include "code\game\gamemodes\technomancer\spells\targeting_matrix.dm"
+#include "code\game\gamemodes\technomancer\spells\track.dm"
#include "code\game\gamemodes\technomancer\spells\warp_strike.dm"
#include "code\game\gamemodes\technomancer\spells\aura\aura.dm"
#include "code\game\gamemodes\technomancer\spells\aura\biomed_aura.dm"
@@ -756,7 +762,6 @@
#include "code\game\objects\items\devices\suit_cooling.dm"
#include "code\game\objects\items\devices\t_scanner.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
-#include "code\game\objects\items\devices\telecrystal.dm"
#include "code\game\objects\items\devices\traitordevices.dm"
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\uplink.dm"
@@ -782,6 +787,7 @@
#include "code\game\objects\items\stacks\nanopaste.dm"
#include "code\game\objects\items\stacks\rods.dm"
#include "code\game\objects\items\stacks\stack.dm"
+#include "code\game\objects\items\stacks\telecrystal.dm"
#include "code\game\objects\items\stacks\sheets\leather.dm"
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
#include "code\game\objects\items\weapons\AI_modules.dm"