"
var/coeff = linked_imprinter.efficiency_coeff
@@ -1001,13 +920,16 @@ proc/CallMaterialName(ID)
continue
var/temp_materials
var/check_materials = 1
- for(var/M in D.materials)
+
+ var/all_materials = D.materials + D.reagents
+
+ for(var/M in all_materials)
temp_materials += " | "
if (!linked_imprinter.check_mat(D, M))
check_materials = 0
- temp_materials += "
"
else
- temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]"
+ temp_materials += " [all_materials[M]/coeff] [CallMaterialName(M)]"
if (check_materials)
dat += "
"
- if(4.2)
+ if(4.2) //Circuit Imprinter Material Storage Sub-menu
dat += "
"
dat += "
Chemical Storage:
"
for(var/datum/reagent/R in linked_imprinter.reagents.reagent_list)
@@ -1051,23 +973,16 @@ proc/CallMaterialName(ID)
dat += "
Main Menu"
dat += "
Circuit Imprinter Menu"
dat += "
Material Storage:
"
- //Glass
- dat += "* [linked_imprinter.g_amount] glass: "
- if(linked_imprinter.g_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
- if(linked_imprinter.g_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
- if(linked_imprinter.g_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
- dat += "
"
- //Gold
- dat += "* [linked_imprinter.gold_amount] gold: "
- if(linked_imprinter.gold_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
- if(linked_imprinter.gold_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
- if(linked_imprinter.gold_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
- dat += "
"
- //Diamond
- dat += "* [linked_imprinter.diamond_amount] diamond: "
- if(linked_imprinter.diamond_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
- if(linked_imprinter.diamond_amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
- if(linked_imprinter.diamond_amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
+ if(!linked_imprinter)
+ dat += "ERROR: Protolathe connection failed."
+ else
+ for(var/mat_id in linked_imprinter.materials.materials)
+ var/datum/material/M = linked_imprinter.materials.materials[mat_id]
+ dat += "* [M.amount] of [M.name]: "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "
Eject "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "
5x "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "
All"
+ dat += "
"
dat += "
"
var/datum/browser/popup = new(user, "rndconsole", name, 460, 550)
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 3778e2c1c73..e90dcb20412 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -81,9 +81,14 @@
return
if (disabled)
return
- if (!linked_console)
- user << "
The [name] must be linked to an R&D console first!"
- return
+ if (!linked_console) // Try to auto-connect to new RnD consoles nearby.
+ for(var/obj/machinery/computer/rdconsole/console in oview(3, src))
+ if(console.first_use)
+ console.SyncRDevices()
+
+ if(!linked_console)
+ user << "
The [name] must be linked to an R&D console first!"
+ return
if (busy)
user << "
The [src.name] is busy right now."
return
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 130fce1f03f..503b35891d5 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -172,12 +172,12 @@ research holder datum.
/datum/tech/engineering
name = "Engineering Research"
- desc = "Development of new and improved engineering parts and."
+ desc = "Development of new and improved engineering parts and tools."
id = "engineering"
/datum/tech/plasmatech
name = "Plasma Research"
- desc = "Research into the mysterious substance colloqually known as 'plasma'."
+ desc = "Research into the mysterious substance colloqually known as \"plasma\"."
id = "plasmatech"
rare = 3
@@ -187,8 +187,8 @@ research holder datum.
id = "powerstorage"
/datum/tech/bluespace
- name = "'Blue-space' Research"
- desc = "Research into the sub-reality known as 'blue-space'"
+ name = "\"Blue-space\" Research"
+ desc = "Research into the sub-reality known as \"blue-space\"."
id = "bluespace"
rare = 2
@@ -218,6 +218,9 @@ research holder datum.
id = "syndicate"
rare = 4
+
+//Secret Technologies (hidden by default, require rare items to reveal)
+
/datum/tech/abductor
name = "Alien Technologies Research"
desc = "The study of technologies used by the advanced alien race known as Abductors."
@@ -225,13 +228,14 @@ research holder datum.
rare = 5
level = 0
-/*
/datum/tech/arcane
name = "Arcane Research"
- desc = "Research into the occult and arcane field for use in practical science"
+ desc = "When sufficiently analyzed, any magic becomes indistinguishable from technology."
id = "arcane"
- level = 0 //It didn't become "secret" as advertised.
+ rare = 5
+ level = 0
+/*
//Branch Techs
/datum/tech/explosives
name = "Explosives Research"
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 9f8e6a580b5..9d79c5f1ced 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -71,6 +71,7 @@
var/rating = 1
/obj/item/weapon/stock_parts/New()
+ ..()
src.pixel_x = rand(-5, 5)
src.pixel_y = rand(-5, 5)
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index 4558125cdfe..755fbde1da1 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -412,27 +412,27 @@
mob_species = /datum/species/human
flavour_text = {"Doomed to walk this eternal hellscape due to means you barely remember at this point, every day is a struggle for survival as you barely scrape by in your makeshift housing."}
-/obj/effect/mob_spawn/human/hermit/special(mob/living/new_spawn)
+/obj/effect/mob_spawn/human/hermit/New()
var/arrpee = rand(1,4)
switch(arrpee)
if(1)
- new_spawn << "You were the sole survivor of a raid-party's onslaught on a small orbital tradestation. You were forced to early-eject your pod to escape, the horrifed faces of the remaining crew when the raiders blew apart the room's airlock forever ingrained in your mind."
+ flavour_text = {"You were the sole survivor of a raid-party's onslaught on a small orbital tradestation. You were forced to early-eject your pod to escape, the horrifed faces of the remaining crew when the raiders blew apart the room's airlock forever ingrained in your mind."}
uniform = /obj/item/clothing/under/assistantformal
shoes = /obj/item/clothing/shoes/sneakers/black
back = /obj/item/weapon/storage/backpack
if(2)
- new_spawn << "A castaway from a far-off civilization, banished for crimes of heresy against the church. You awoke from hypersleep your pod crashlanding into this hellscape, only the essentials left to make a new life for yourself."
+ flavour_text = {"A castaway from a far-off civilization, banished for crimes of heresy against the church. You awoke from hypersleep your pod crashlanding into this hellscape, only the essentials left to make a new life for yourself."}
uniform = /obj/item/clothing/under/rank/prisoner
shoes = /obj/item/clothing/shoes/sneakers/orange
back = /obj/item/weapon/storage/backpack
if(3)
- new_spawn << "A runaway from the tyranny of Nanotrasen and everything all these damnned corporations stand for. From a metaphorical hell to a literal one, you do your best to put your station-life behind you to try and survive in this harsh land."
+ flavour_text = {"A runaway from the tyranny of Nanotrasen and everything all these damnned corporations stand for. From a metaphorical hell to a literal one, you do your best to put your station-life behind you to try and survive in this harsh land."}
uniform = /obj/item/clothing/under/rank/medical
suit = /obj/item/clothing/suit/toggle/labcoat
back = /obj/item/weapon/storage/backpack/medic
shoes = /obj/item/clothing/shoes/sneakers/black
if(4)
- new_spawn << "You weren't exactly the sharpest tool in the shed, hitting that big red button on the escape pod wondering what it'd do. Whether this 'special' attribute of yours is a defect of cloning or just genuine stupidity, the fact you've survived this long in a literal hellhole is enough to make Darwin roll in his grave."
+ flavour_text = {"You weren't exactly the sharpest tool in the shed, hitting that big red button on the escape pod wondering what it'd do. Whether this 'special' attribute of yours is a defect of cloning or just genuine stupidity, the fact you've survived this long in a literal hellhole is enough to make Darwin roll in his grave."}
uniform = /obj/item/clothing/under/color/grey/glorf
shoes = /obj/item/clothing/shoes/sneakers/black
back = /obj/item/weapon/storage/backpack
\ No newline at end of file
diff --git a/code/modules/spells/spell_types/demon.dm b/code/modules/spells/spell_types/demon.dm
index ddbd41edaa8..c58ee8b1839 100644
--- a/code/modules/spells/spell_types/demon.dm
+++ b/code/modules/spells/spell_types/demon.dm
@@ -149,7 +149,7 @@
src.ExtinguishMob()
if(buckled)
buckled.unbuckle_mob(src,force=1)
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
unbuckle_all_mobs(force=1)
if(pulledby)
pulledby.stop_pulling()
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index 9afa9929390..71b58883ddb 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -35,7 +35,7 @@
if(target.pulledby)
target.pulledby.stop_pulling()
target.stop_pulling()
- if(target.buckled_mobs.len)
+ if(target.has_buckled_mobs())
target.unbuckle_all_mobs(force=1)
jaunt_disappear(animation, target)
target.loc = holder
diff --git a/code/modules/spells/spell_types/turf_teleport.dm b/code/modules/spells/spell_types/turf_teleport.dm
index d649c488967..0c473f67297 100644
--- a/code/modules/spells/spell_types/turf_teleport.dm
+++ b/code/modules/spells/spell_types/turf_teleport.dm
@@ -40,7 +40,7 @@
if(!target.Move(picked))
if(target.buckled)
target.buckled.unbuckle_mob(target,force=1)
- if(target.buckled_mobs.len)
+ if(target.has_buckled_mobs())
target.unbuckle_all_mobs(force=1)
target.loc = picked
playsound(get_turf(user), sound2, 50,1)
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index f882b4444c7..03fc5baf7bb 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -6,7 +6,7 @@ var/list/GPS_list = list()
icon_state = "gps-c"
w_class = 2
slot_flags = SLOT_BELT
- origin_tech = "materials=2;magnets=3;bluespace=3"
+ origin_tech = "materials=2;magnets=1;bluespace=2"
var/gpstag = "COM0"
var/emped = 0
var/turf/locked_location
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index bf77878eae0..fbe44181235 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -18,7 +18,7 @@
obj/vehicle/atv/post_buckle_mob(mob/living/M)
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
overlays += atvcover
else
overlays -= atvcover
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index e0792514af8..b00bc315680 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -10,7 +10,7 @@
/obj/vehicle/janicart/handle_vehicle_offsets()
..()
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
switch(buckled_mob.dir)
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index e894e3c1c4a..49a36bf69e0 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -21,7 +21,7 @@
/obj/vehicle/scooter/handle_vehicle_offsets()
..()
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
switch(buckled_mob.dir)
@@ -46,14 +46,14 @@
density = 0
/obj/vehicle/scooter/skateboard/post_buckle_mob(mob/living/M)//allows skateboards to be non-dense but still allows 2 skateboarders to collide with each other
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
density = 1
else
density = 0
/obj/vehicle/scooter/skateboard/Bump(atom/A)
..()
- if(A.density && buckled_mobs.len)
+ if(A.density && has_buckled_mobs())
var/mob/living/carbon/H = buckled_mobs[1]
var/atom/throw_target = get_edge_target_turf(H, pick(cardinal))
unbuckle_mob(H)
diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm
index 7602f9f4356..e9fa351f398 100644
--- a/code/modules/vehicles/speedbike.dm
+++ b/code/modules/vehicles/speedbike.dm
@@ -26,7 +26,7 @@
dir = move_dir
/obj/vehicle/space/speedbike/Move(newloc,move_dir)
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
PoolOrNew(/obj/effect/overlay/temp/speedbike_trail,list(loc,move_dir))
. = ..()
@@ -40,7 +40,7 @@
pixel_y = 0
/obj/vehicle/space/speedbike/handle_vehicle_offsets()
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
buckled_mob.dir = dir
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 96582344dfc..32f0c0f886b 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -36,7 +36,7 @@
//if they differ between directions, otherwise use the
//generic variables
/obj/vehicle/proc/handle_vehicle_offsets()
- if(buckled_mobs.len)
+ if(has_buckled_mobs())
for(var/m in buckled_mobs)
var/mob/living/buckled_mob = m
buckled_mob.dir = dir
@@ -123,7 +123,7 @@
/obj/vehicle/Bump(atom/movable/M)
. = ..()
if(auto_door_open)
- if(istype(M, /obj/machinery/door) && buckled_mobs.len)
+ if(istype(M, /obj/machinery/door) && has_buckled_mobs())
for(var/m in buckled_mobs)
M.Bumped(m)
diff --git a/html/changelog.html b/html/changelog.html
index 37a3acc125e..fc7a43aa6e3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,96 @@
-->
+
08 June 2016
+
Cruix updated:
+
+ - Changelings no longer lose the regenerate ability if they respect while in regenerative stasis.
+
+
Fox McCloud updated:
+
+ - Fixes Experimentor critical reactions not working
+ - Fixes Experimentor item cloning not working
+ - Fixes Experimentor producing coffee vending machines instead of coffe cups
+ - Experimentor can only clone critical reaction items instead of anything with an origin tech
+
+
GunHog updated:
+
+ - Nanotrasen has approved the Hyper-Kenetic Accelerator upgrade for cyborg mining modules.
+ - Each of the heads' ID computers are now themed for their department!
+
+
Joan updated:
+
+ - Anima Fragments have slightly more health and move faster, but slow down temporarily when taking damage. Also they can move in space now.
+
+
Kor updated:
+
+ - The clown will play a sad trombone noise upon death.
+
+
PKPenguin321 updated:
+
+ - You can now emag chemical dispensers, such as the ones in chemistry or the bar, to unlock illegal chemicals.
+
+
+
07 June 2016
+
Bobylein updated:
+
+ - Nanotrasen is finally able to source transparent bottles for chemistry.
+
+
Iamgoofball updated:
+
+ - The Greytide Virus got some teeth.
+
+
Joan updated:
+
+ - This is a bunch of Clockwork Cult changes.
+ - Added the Clockwork Obelisk, an Application scripture that produces a clockwork obelisk, which can Hierophant Broadcast a large message to all servants or open a Spatial Gateway with 5 uses and a 10 second duration to any conscious servant or clockwork obelisk.
+ - Spatial Gateways of any source have doubled uses and duration when the target is a clockwork obelisk.
+ - Added the Mania Motor, an Application scripture that produces a mania motor, which, while active, causes hallucinations and brain damage in all nearby humans.
+ - The Mania Motor will try to convert any non-servant human directly adjacent to it at an additional power cost and will remove brain damage, hallucinations, and the druggy effect from servants.
+ - Added the Vitality Matrix, an Application scripture that produces a sigil that will slowly drain health from non-servants that remain on it. Servants that remain on the sigil will instead be healed with the vitality drained from non-servants.
+ - The Vitality Matrix can revive dead servants for a cost of 25 vitality plus all non-oxygen damage the servant has. If it cannot immediately revive a servant, it will still heal their corpse.
+ - Most clockwork structures, including the Mending Motor, Interdiction Lens, and the newly added Clockwork Obelisk and Mania Motor, now require power to function.
+ - Mending Motors can still use alloy for power.
+ - The Sigil of Transmission has been remade into a power battery and will power directly adjecent clockwork structures. Sigils of Transmission start off with 4000 power and can be recharged with Volt Void.
+ - Volt Void drains somewhat more power, but will not damage the invoker unless they drain too much power. Invokers with augmented limbs will instead have those limbs healed unless they drain especially massive amounts of power.
+ - Using Volt Void on top of a Sigil of Transmission will transfer most of the power drained to the Sigil of Transmission, effectively making it far less likely to damage the invoker.
+ - You can no longer stack most sigils and clockwork objects with themself. You can still have multiple different objects or sigils on a tile, however.
+ - The Break Will Script has been renamed to Dementia Doctrine, is slightly faster, and causes slightly more brain damage.
+ - The Judicial Visor now uses an action button instead of alt-click. Cultists of Nar-Sie judged by the visor will be stunned for half duration, but will be set on fire.
+ - Multiple scriptures have had their component requirements changed. The Summon Judicial Visor Script has been reduced from a Script to a Driver.
+ - Recollection will now show both required and consumed components.
+ - Clockwork Marauders can now emerge from their host if their host is at or below 60% total health(for humans, this is 20 health out of crit)
+ - Clockwork Marauders will slowly heal if directly adjacent to their host and have a slightly larger threshold for their no-Fatigue bonus damage.
+
+
Quiltyquilty updated:
+
+ - Botany, atmospherics and cargo now all have access to high-capacity watertanks.
+ - The bar has now been outfitted with custom bar stools.
+
+
Xhuis updated:
+
+ - Removed the global message played when Nar-Sie _begins_ to spawn (but not when it actually spawns).
+ - Drunkenness recovery speed now increases with how drunk the imbiber is and is much quicker when the imbiber is asleep.
+ - Suit storage units now take three seconds to enter (up from one) and have different sounds and messages for UV ray cauterization.
+ - Fixed some bugs with the suit storage unit, inserting mobs, and contents to seemed to duplicate themselves.
+ - The Summon Nar-Sie rune can now only be drawn on original station tiles and fails to invoke if scribed on the station then moved elsewhere.
+
+
coiax updated:
+
+ - Bluespace shelter capsules can no longer be used on shuttles.
+ - Bluespace shelters may have different capsules stored. View what your capsule has inside by examining it.
+ - The Nar'sie rune cannot be scribed on shuttles or off Z-level.
+ - The Raise Dead rune automatically grabs the ghost of the raised corpse.
+ - Deadchat is now notified when a sentient mob dies.
+
+
phil235 updated:
+
+ - Monkeys and all other animals that should have blood now has it. Beating them up will make you and your weapon bloody, just like beating a human does. Dragging them when wounded and lying will leave a blood trail. Their blood is still mostly cosmetic, they suffer no effects from low blood level, unlike humans.
+ - When a mob leaves a blood trail while dragged, it loses blood. You can no longer drag a corpse to make an inifinite amount of blood trails, because once the victim's blood reaches a certain threshold it no longer leaves a blood trail (and no longer lose any more blood). The threshold depends on how much damage the mob has taken. You can always avoid hurting the dragged mob by making them stand up or by buckling them to something or by putting them in a container.
+ - You can no longer empty a mob of its blood entirely with a syringe, once the mob's blood volume reaches a critically low level you are unable to draw any more blood from it.
+ - A changeling absorbing a human now sucks all their blood.
+
+
05 June 2016
Joan updated:
@@ -1124,74 +1214,6 @@
- Due to budget cuts, Nanotrasen is no longer utilizing copy-protected paper for its classified documents. Fortunately, our world-class security team has always prevented any thefts or photocopies from being made!
- Secret documents can be photocopied. If you have an objective to steal any set of documents, a photocopy will be accepted. If you must steal red or blue documents, a photocopy will NOT be accepted. Enterprising traitors can forge the red/blue seal with a crayon to take advantage of this.
-
-
06 April 2016
-
CoreOverload updated:
-
- - You can now put slimes in stasis by exposing them to room temp CO2. Useful for both fighting the slimes and safely storing them.
-
-
Erwgd updated:
-
- - The autolathe can now make hydroponics tools! Access the design routines in the Misc. category of the machine.
-
-
LanCartwright updated:
-
- - Custom viruses with stealth values of 3 or above are now invisible on the PANDEMIC and no longer visible on health huds.
-
-
MrStonedOne updated:
-
- - Centcom is happy to report that our single sided windows and our windoors should once again create an airtight seal.
-
-
bgobandit updated:
-
- - Honk! Nanotrasen's clowning and development department has invented the clown megaphone, standard in all clowning loadouts! Honk honk!
-
-
-
05 April 2016
-
Erwgd updated:
-
- - Utility belts of all kinds can now accept gloves. Most belts, except janitorial belts, may now also hold station bounced radios.
- - Hazard vests and most jackets can carry a station bounced radio as well. Labcoats can be used to store a handheld crew monitor.
- - The autolathe can now make toolboxes.
-
-
Joan updated:
-
- - Adds protector holoparasites to traitor holoparasite injectors.
- - Protector holoparasites cause the summoner to teleport to them when out of range, instead of the other way around.
- - Protector holoparasites have two modes; Combat, where they do and take medium damage, and Protection, where they do and take almost no damage, but move slightly slower.
- - Explosive Holoparasites no longer teleport non-mobs when attacking, but have a higher chance to teleport mobs.
- - Explosive Holoparasite bombs no longer trigger on their summoner or any other parasites their summoner has.
- - Ranged Holoparasites no longer have nightvision active by default. It can still be toggled on.
- - Ranged Holoparasite snares no longer alert if the crossing mob is their summoner or one of the parasites their summoner has.
- - Ranged Holoparasites are slightly less visible in scout mode.
- - Standard Holoparasites attack 20% faster than other parasite types.
- - Support Holoparasite beacons no longer require safe atmospheric conditions, but the warp channel takes slightly longer, and is preceded with a visible message.
- - Zombies can no longer destroy more than one airlock at a time.
- - The mining station has been updated.
-
-
MrStonedOne updated:
-
- - Centcom is glad to announce the end of sending workers to our control group for space exposure testing, a fake station in "space" that noticeably had air in "space".
-
-
TechnoAlchemisto updated:
-
- - Detective scanners are now smaller.
- - Pickaxes now fit in explorer suit exosuit slots.
-
-
bgobandit updated:
-
- - Alt-clicking a fire extinguisher cabinet opens and closes it. That is all.
-
-
-
04 April 2016
-
TechnoAlchemisto updated:
-
- - The recipes for some Trekchems are now back in the game
- - Bicaridine can be made with carbon, oxygen, and sugar.
- - Kelotane can be made with silicon and carbon.
- - Antitoxin can be made with nitrogen, silicon, and potassium
- - tricordrazine can be made by combining all three.
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d25985dd36f..944c4906364 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5362,3 +5362,115 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Gravity Guns! It is a mildly expensive R&D gun that has a 5 second cooldown
between shots, but doesn't need to be recharged. It has two modes, attract and
repulse. For all your gravity-manipulation needs!
+2016-06-07:
+ Bobylein:
+ - rscadd: Nanotrasen is finally able to source transparent bottles for chemistry.
+ Iamgoofball:
+ - experiment: The Greytide Virus got some teeth.
+ Joan:
+ - wip: This is a bunch of Clockwork Cult changes.
+ - rscadd: Added the Clockwork Obelisk, an Application scripture that produces a
+ clockwork obelisk, which can Hierophant Broadcast a large message to all servants
+ or open a Spatial Gateway with 5 uses and a 10 second duration to any conscious
+ servant or clockwork obelisk.
+ - wip: Spatial Gateways of any source have doubled uses and duration when the target
+ is a clockwork obelisk.
+ - rscadd: Added the Mania Motor, an Application scripture that produces a mania
+ motor, which, while active, causes hallucinations and brain damage in all nearby
+ humans.
+ - wip: The Mania Motor will try to convert any non-servant human directly adjacent
+ to it at an additional power cost and will remove brain damage, hallucinations,
+ and the druggy effect from servants.
+ - rscadd: Added the Vitality Matrix, an Application scripture that produces a sigil
+ that will slowly drain health from non-servants that remain on it. Servants
+ that remain on the sigil will instead be healed with the vitality drained from
+ non-servants.
+ - wip: The Vitality Matrix can revive dead servants for a cost of 25 vitality plus
+ all non-oxygen damage the servant has. If it cannot immediately revive a servant,
+ it will still heal their corpse.
+ - experiment: Most clockwork structures, including the Mending Motor, Interdiction
+ Lens, and the newly added Clockwork Obelisk and Mania Motor, now require power
+ to function.
+ - wip: Mending Motors can still use alloy for power.
+ - tweak: The Sigil of Transmission has been remade into a power battery and will
+ power directly adjecent clockwork structures. Sigils of Transmission start off
+ with 4000 power and can be recharged with Volt Void.
+ - tweak: Volt Void drains somewhat more power, but will not damage the invoker unless
+ they drain too much power. Invokers with augmented limbs will instead have those
+ limbs healed unless they drain especially massive amounts of power.
+ - wip: Using Volt Void on top of a Sigil of Transmission will transfer most of the
+ power drained to the Sigil of Transmission, effectively making it far less likely
+ to damage the invoker.
+ - rscdel: You can no longer stack most sigils and clockwork objects with themself.
+ You can still have multiple different objects or sigils on a tile, however.
+ - tweak: The Break Will Script has been renamed to Dementia Doctrine, is slightly
+ faster, and causes slightly more brain damage.
+ - tweak: The Judicial Visor now uses an action button instead of alt-click. Cultists
+ of Nar-Sie judged by the visor will be stunned for half duration, but will be
+ set on fire.
+ - tweak: Multiple scriptures have had their component requirements changed. The
+ Summon Judicial Visor Script has been reduced from a Script to a Driver.
+ - rscadd: Recollection will now show both required and consumed components.
+ - tweak: Clockwork Marauders can now emerge from their host if their host is at
+ or below 60% total health(for humans, this is 20 health out of crit)
+ - tweak: Clockwork Marauders will slowly heal if directly adjacent to their host
+ and have a slightly larger threshold for their no-Fatigue bonus damage.
+ Quiltyquilty:
+ - rscadd: Botany, atmospherics and cargo now all have access to high-capacity watertanks.
+ - rscadd: The bar has now been outfitted with custom bar stools.
+ Xhuis:
+ - rscdel: Removed the global message played when Nar-Sie _begins_ to spawn (but
+ not when it actually spawns).
+ - tweak: Drunkenness recovery speed now increases with how drunk the imbiber is
+ and is much quicker when the imbiber is asleep.
+ - tweak: Suit storage units now take three seconds to enter (up from one) and have
+ different sounds and messages for UV ray cauterization.
+ - bugfix: Fixed some bugs with the suit storage unit, inserting mobs, and contents
+ to seemed to duplicate themselves.
+ - bugfix: The Summon Nar-Sie rune can now only be drawn on original station tiles
+ and fails to invoke if scribed on the station then moved elsewhere.
+ coiax:
+ - rscdel: Bluespace shelter capsules can no longer be used on shuttles.
+ - rscadd: Bluespace shelters may have different capsules stored. View what your
+ capsule has inside by examining it.
+ - rscdel: The Nar'sie rune cannot be scribed on shuttles or off Z-level.
+ - rscadd: The Raise Dead rune automatically grabs the ghost of the raised corpse.
+ - rscadd: Deadchat is now notified when a sentient mob dies.
+ phil235:
+ - rscadd: Monkeys and all other animals that should have blood now has it. Beating
+ them up will make you and your weapon bloody, just like beating a human does.
+ Dragging them when wounded and lying will leave a blood trail. Their blood is
+ still mostly cosmetic, they suffer no effects from low blood level, unlike humans.
+ - rscadd: When a mob leaves a blood trail while dragged, it loses blood. You can
+ no longer drag a corpse to make an inifinite amount of blood trails, because
+ once the victim's blood reaches a certain threshold it no longer leaves a blood
+ trail (and no longer lose any more blood). The threshold depends on how much
+ damage the mob has taken. You can always avoid hurting the dragged mob by making
+ them stand up or by buckling them to something or by putting them in a container.
+ - rscdel: You can no longer empty a mob of its blood entirely with a syringe, once
+ the mob's blood volume reaches a critically low level you are unable to draw
+ any more blood from it.
+ - tweak: A changeling absorbing a human now sucks all their blood.
+2016-06-08:
+ Cruix:
+ - bugfix: Changelings no longer lose the regenerate ability if they respect while
+ in regenerative stasis.
+ Fox McCloud:
+ - bugfix: Fixes Experimentor critical reactions not working
+ - bugfix: Fixes Experimentor item cloning not working
+ - bugfix: Fixes Experimentor producing coffee vending machines instead of coffe
+ cups
+ - tweak: Experimentor can only clone critical reaction items instead of anything
+ with an origin tech
+ GunHog:
+ - rscadd: Nanotrasen has approved the Hyper-Kenetic Accelerator upgrade for cyborg
+ mining modules.
+ - tweak: Each of the heads' ID computers are now themed for their department!
+ Joan:
+ - tweak: Anima Fragments have slightly more health and move faster, but slow down
+ temporarily when taking damage. Also they can move in space now.
+ Kor:
+ - rscadd: The clown will play a sad trombone noise upon death.
+ PKPenguin321:
+ - rscadd: You can now emag chemical dispensers, such as the ones in chemistry or
+ the bar, to unlock illegal chemicals.
diff --git a/html/changelogs/AutoChangeLog-pr-17934.yml b/html/changelogs/AutoChangeLog-pr-17934.yml
deleted file mode 100644
index 4cd736e2ba4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17934.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: coiax
-delete-after: True
-changes:
- - rscdel: "Bluespace shelter capsules can no longer be used on shuttles."
- - rscadd: "Bluespace shelters may have different capsules stored. View what your capsule has inside by examining it."
diff --git a/html/changelogs/AutoChangeLog-pr-17968.yml b/html/changelogs/AutoChangeLog-pr-17968.yml
deleted file mode 100644
index 2367575fa5b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-17968.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Bobylein
-delete-after: True
-changes:
- - rscadd: "Nanotrasen is finally able to source transparent bottles for chemistry."
diff --git a/html/changelogs/AutoChangeLog-pr-18108.yml b/html/changelogs/AutoChangeLog-pr-18108.yml
deleted file mode 100644
index 536059097c6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18108.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: coiax
-delete-after: True
-changes:
- - rscdel: "The Nar'sie rune cannot be scribed on shuttles or off Z-level."
- - rscadd: "The Raise Dead rune automatically grabs the ghost of the raised corpse."
diff --git a/html/changelogs/AutoChangeLog-pr-18197.yml b/html/changelogs/AutoChangeLog-pr-18197.yml
deleted file mode 100644
index c0021f6f875..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18197.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Quiltyquilty
-delete-after: True
-changes:
- - rscadd: "Botany, atmospherics and cargo now all have access to high-capacity watertanks."
diff --git a/html/changelogs/AutoChangeLog-pr-18218.yml b/html/changelogs/AutoChangeLog-pr-18218.yml
deleted file mode 100644
index 15e624f544f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18218.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Xhuis
-delete-after: True
-changes:
- - rscdel: "Removed the global message played when Nar-Sie _begins_ to spawn (but not when it actually spawns)."
- - tweak: "Drunkenness recovery speed now increases with how drunk the imbiber is and is much quicker when the imbiber is asleep."
- - tweak: "Suit storage units now take three seconds to enter (up from one) and have different sounds and messages for UV ray cauterization."
- - bugfix: "Fixed some bugs with the suit storage unit, inserting mobs, and contents to seemed to duplicate themselves."
- - bugfix: "The Summon Nar-Sie rune can now only be drawn on original station tiles and fails to invoke if scribed on the station then moved elsewhere."
diff --git a/html/changelogs/AutoChangeLog-pr-18241.yml b/html/changelogs/AutoChangeLog-pr-18241.yml
deleted file mode 100644
index 341f132ab60..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18241.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: phil235
-delete-after: True
-changes:
- - rscadd: "Monkeys and all other animals that should have blood now has it. Beating them up will make you and your weapon bloody, just like beating a human does. Dragging them when wounded and lying will leave a blood trail. Their blood is still mostly cosmetic, they suffer no effects from low blood level, unlike humans."
- - rscadd: "When a mob leaves a blood trail while dragged, it loses blood. You can no longer drag a corpse to make an inifinite amount of blood trails, because once the victim's blood reaches a certain threshold it no longer leaves a blood trail (and no longer lose any more blood). The threshold depends on how much damage the mob has taken. You can always avoid hurting the dragged mob by making them stand up or by buckling them to something or by putting them in a container."
- - rscdel: "You can no longer empty a mob of its blood entirely with a syringe, once the mob's blood volume reaches a critically low level you are unable to draw any more blood from it."
- - tweak: "A changeling absorbing a human now sucks all their blood."
diff --git a/html/changelogs/AutoChangeLog-pr-18259.yml b/html/changelogs/AutoChangeLog-pr-18259.yml
deleted file mode 100644
index 7d2db181f7a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18259.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Iamgoofball
-delete-after: True
-changes:
- - experiment: "The Greytide Virus got some teeth."
diff --git a/html/changelogs/AutoChangeLog-pr-18263.yml b/html/changelogs/AutoChangeLog-pr-18263.yml
deleted file mode 100644
index 620bf0af65c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18263.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Quiltyquilty
-delete-after: True
-changes:
- - rscadd: "The bar has now been outfitted with custom bar stools."
diff --git a/html/changelogs/AutoChangeLog-pr-18264.yml b/html/changelogs/AutoChangeLog-pr-18264.yml
deleted file mode 100644
index fda3ad00227..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18264.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: coiax
-delete-after: True
-changes:
- - rscadd: "Deadchat is now notified when a sentient mob dies."
diff --git a/html/changelogs/AutoChangeLog-pr-18292.yml b/html/changelogs/AutoChangeLog-pr-18292.yml
deleted file mode 100644
index 059ad70ec85..00000000000
--- a/html/changelogs/AutoChangeLog-pr-18292.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-author: Joan
-delete-after: True
-changes:
- - wip: "This is a bunch of Clockwork Cult changes."
- - rscadd: "Added the Clockwork Obelisk, an Application scripture that produces a clockwork obelisk, which can Hierophant Broadcast a large message to all servants or open a Spatial Gateway with 5 uses and a 10 second duration to any conscious servant or clockwork obelisk."
- - wip: "Spatial Gateways of any source have doubled uses and duration when the target is a clockwork obelisk."
- - rscadd: "Added the Mania Motor, an Application scripture that produces a mania motor, which, while active, causes hallucinations and brain damage in all nearby humans."
- - wip: "The Mania Motor will try to convert any non-servant human directly adjacent to it at an additional power cost and will remove brain damage, hallucinations, and the druggy effect from servants."
- - rscadd: "Added the Vitality Matrix, an Application scripture that produces a sigil that will slowly drain health from non-servants that remain on it. Servants that remain on the sigil will instead be healed with the vitality drained from non-servants."
- - wip: "The Vitality Matrix can revive dead servants for a cost of 25 vitality plus all non-oxygen damage the servant has. If it cannot immediately revive a servant, it will still heal their corpse."
- - experiment: "Most clockwork structures, including the Mending Motor, Interdiction Lens, and the newly added Clockwork Obelisk and Mania Motor, now require power to function."
- - wip: "Mending Motors can still use alloy for power."
- - tweak: "The Sigil of Transmission has been remade into a power battery and will power directly adjecent clockwork structures. Sigils of Transmission start off with 4000 power and can be recharged with Volt Void."
- - tweak: "Volt Void drains somewhat more power, but will not damage the invoker unless they drain too much power. Invokers with augmented limbs will instead have those limbs healed unless they drain especially massive amounts of power."
- - wip: "Using Volt Void on top of a Sigil of Transmission will transfer most of the power drained to the Sigil of Transmission, effectively making it far less likely to damage the invoker."
- - rscdel: "You can no longer stack most sigils and clockwork objects with themself. You can still have multiple different objects or sigils on a tile, however."
- - tweak: "The Break Will Script has been renamed to Dementia Doctrine, is slightly faster, and causes slightly more brain damage."
- - tweak: "The Judicial Visor now uses an action button instead of alt-click. Cultists of Nar-Sie judged by the visor will be stunned for half duration, but will be set on fire."
- - tweak: "Multiple scriptures have had their component requirements changed. The Summon Judicial Visor Script has been reduced from a Script to a Driver."
- - rscadd: "Recollection will now show both required and consumed components."
- - tweak: "Clockwork Marauders can now emerge from their host if their host is at or below 60% total health(for humans, this is 20 health out of crit)"
- - tweak: "Clockwork Marauders will slowly heal if directly adjacent to their host and have a slightly larger threshold for their no-Fatigue bonus damage."
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index cd5cd3df688..9b59c86f6de 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 5dc233f9bc7..166cf93373a 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index e359eb9d2f5..2a26590dff3 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index a1062f3055f..47ea33e6957 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -681,6 +681,7 @@
#include "code\game\objects\items\weapons\grenades\syndieminibomb.dm"
#include "code\game\objects\items\weapons\implants\implant.dm"
#include "code\game\objects\items\weapons\implants\implant_chem.dm"
+#include "code\game\objects\items\weapons\implants\implant_clown.dm"
#include "code\game\objects\items\weapons\implants\implant_explosive.dm"
#include "code\game\objects\items\weapons\implants\implant_freedom.dm"
#include "code\game\objects\items\weapons\implants\implant_krav_maga.dm"