I hear strange whispers from the halls, longing for blood. Something isn't right here. Why did they transfer us here to work in the first place? "
+
+/obj/item/weapon/paper/crumpled/stations/cere/empty_station
+ info = "I can't be here for much longer, this station is too empty for its own good. Something is wrong..."
+
+/obj/item/weapon/paper/crumpled/bloody/hop
+ info = "...THE HOPLINE CALLS...IT THIRSTS FOR BLOOD...I MUST GO..."
+
+/obj/item/weapon/paper/crumpled/stations/cere/rocks1
+ info = "...SOMETHING IN THE ROCKS, IT WATCHES US ALL..."
+
+/obj/item/weapon/paper/crumpled/stations/cere/rocks2
+ info = "...THEY SENT US HERE FOR A REASON...TERRIBLE..."
+
+/obj/item/weapon/paper/crumpled/stations/cere/rocks3
+ info = "...EMPTY HALLS...USELESS SPACE..."
+
+
+/////////// Centcom
+
+/obj/item/weapon/paper/fluff/stations/centcom/disk_memo
+ name = "memo"
+ info = "GET DAT FUKKEN DISK"
+
+/obj/item/weapon/paper/fluff/stations/centcom/broken_evac
+ info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.
We apologise for the inconvinience this may cause you.
Please enjoy the use of this complementary book.
Sincerely,
Centcom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
+
+/obj/item/weapon/paper/fluff/stations/centcom/bulletin
+ name = "paper- 'Official Bulletin'"
+ info = "
Centcom Security
Port Division
Official Bulletin
Inspector,
There is an emergency shuttle arriving today.
Approval is restricted to Nanotrasen employees only. Deny all other entrants.
Centcom Port Commissioner"
+
+
+/////////// Lavaland
+
+/obj/item/weapon/paper/fluff/stations/lavaland/orm_notice
+ name = "URGENT!"
+ info = "A hastily written note has been scribbled here...
Please use the ore redemption machine in the cargo office for smelting. PLEASE!
--The Research Staff"
+
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 5c2d5a58993..03852caf46e 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -76,7 +76,7 @@ By design, d1 is the smallest direction and d2 is the highest
d2 = text2num( copytext( icon_state, dash+1 ) )
- var/turf/T = src.loc // hide if turf is not intact
+ var/turf/T = get_turf(src) // hide if turf is not intact
if(level==1) hide(T.intact)
GLOB.cable_list += src //add it to the global cable list
@@ -115,14 +115,8 @@ By design, d1 is the smallest direction and d2 is the highest
else
icon_state = "[d1]-[d2]"
-
-// Items usable on a cable :
-// - Wirecutters : cut it duh !
-// - Cable coil : merge cables
-// - Multitool : get the power currently passing through the cable
-//
-/obj/structure/cable/attackby(obj/item/W, mob/user, params)
- var/turf/T = src.loc
+/obj/structure/cable/proc/handlecable(obj/item/W, mob/user, params)
+ var/turf/T = get_turf(src)
if(T.intact)
return
if(istype(W, /obj/item/weapon/wirecutters))
@@ -141,6 +135,12 @@ By design, d1 is the smallest direction and d2 is the highest
return
coil.cable_join(src, user)
+ else if(istype(W, /obj/item/weapon/twohanded/rcl))
+ var/obj/item/weapon/twohanded/rcl/R = W
+ if(R.loaded)
+ R.loaded.cable_join(src, user)
+ R.is_empty(user)
+
else if(istype(W, /obj/item/device/multitool))
if(powernet && (powernet.avail > 0)) // is it powered?
to_chat(user, "[powernet.avail]W in power network.")
@@ -150,6 +150,15 @@ By design, d1 is the smallest direction and d2 is the highest
src.add_fingerprint(user)
+// Items usable on a cable :
+// - Wirecutters : cut it duh !
+// - Cable coil : merge cables
+// - Multitool : get the power currently passing through the cable
+//
+/obj/structure/cable/attackby(obj/item/W, mob/user, params)
+ handlecable(W, user, params)
+
+
// shock the user with probability prb
/obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1)
if(!prob(prb))
@@ -507,6 +516,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
// General procedures
///////////////////////////////////
+
//you can use wires to heal robotics
/obj/item/stack/cable_coil/attack(mob/living/carbon/human/H, mob/user)
if(!istype(H))
@@ -564,11 +574,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
return new path (location)
// called when cable_coil is clicked on a turf
-/obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user)
+/obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user, dirnew)
if(!isturf(user.loc))
return
- if(!T.can_have_cabling())
+ if(!isturf(T) || T.intact || !T.can_have_cabling())
to_chat(user, "You can only lay cables on catwalks and plating!")
return
@@ -580,47 +590,50 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
to_chat(user, "You can't lay cable at a place that far away!")
return
- else
- var/dirn
-
+ var/dirn
+ if(!dirnew) //If we weren't given a direction, come up with one! (Called as null from catwalk.dm and floor.dm)
if(user.loc == T)
- dirn = user.dir // if laying on the tile we're on, lay in the direction we're facing
+ dirn = user.dir //If laying on the tile we're on, lay in the direction we're facing
else
dirn = get_dir(T, user)
+ else
+ dirn = dirnew
- for(var/obj/structure/cable/LC in T)
- if(LC.d2 == dirn && LC.d1 == 0)
- to_chat(user, "There's already a cable at that position!")
- return
+ for(var/obj/structure/cable/LC in T)
+ if(LC.d2 == dirn && LC.d1 == 0)
+ to_chat(user, "There's already a cable at that position!")
+ return
- var/obj/structure/cable/C = get_new_cable(T)
+ var/obj/structure/cable/C = get_new_cable(T)
- //set up the new cable
- C.d1 = 0 //it's a O-X node cable
- C.d2 = dirn
- C.add_fingerprint(user)
- C.update_icon()
+ //set up the new cable
+ C.d1 = 0 //it's a O-X node cable
+ C.d2 = dirn
+ C.add_fingerprint(user)
+ C.update_icon()
- //create a new powernet with the cable, if needed it will be merged later
- var/datum/powernet/PN = new()
- PN.add_cable(C)
+ //create a new powernet with the cable, if needed it will be merged later
+ var/datum/powernet/PN = new()
+ PN.add_cable(C)
- C.mergeConnectedNetworks(C.d2) //merge the powernet with adjacents powernets
- C.mergeConnectedNetworksOnTurf() //merge the powernet with on turf powernets
+ C.mergeConnectedNetworks(C.d2) //merge the powernet with adjacents powernets
+ C.mergeConnectedNetworksOnTurf() //merge the powernet with on turf powernets
- if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
- C.mergeDiagonalsNetworks(C.d2)
+ if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
+ C.mergeDiagonalsNetworks(C.d2)
+ use(1)
- use(1)
+ if(C.shock(user, 50))
+ if(prob(50)) //fail
+ new /obj/item/stack/cable_coil(get_turf(C), 1, C.color)
+ C.deconstruct()
- if (C.shock(user, 50))
- if (prob(50)) //fail
- C.deconstruct()
+ return C
// called when cable_coil is click on an installed obj/cable
// or click on a turf that already contains a "node" cable
-/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user)
+/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user, var/showerror = TRUE)
var/turf/U = user.loc
if(!isturf(U))
return
@@ -644,7 +657,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
// one end of the clicked cable is pointing towards us
if(C.d1 == dirn || C.d2 == dirn)
if(!U.can_have_cabling()) //checking if it's a plating or catwalk
- to_chat(user, "You can only lay cables on catwalks and plating!")
+ if (showerror)
+ to_chat(user, "You can only lay cables on catwalks and plating!")
return
if(U.intact) //can't place a cable if it's a plating with a tile on it
to_chat(user, "You can't lay cable there unless the floor tiles are removed!")
@@ -657,7 +671,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already
if(LC.d1 == fdirn || LC.d2 == fdirn)
- to_chat(user, "There's already a cable at that position!")
+ if (showerror)
+ to_chat(user, "There's already a cable at that position!")
return
var/obj/structure/cable/NC = get_new_cable (U)
@@ -701,7 +716,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
if(LC == C) // skip the cable we're interacting with
continue
if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction
- to_chat(user, "There's already a cable at that position!")
+ if (showerror)
+ to_chat(user, "There's already a cable at that position!")
+
return
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 0fc8456c7b7..6a46b03fba5 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/stock_parts/cell
name = "power cell"
- desc = "A rechargable electrochemical power cell."
+ desc = "A rechargeable electrochemical power cell."
icon = 'icons/obj/power.dmi'
icon_state = "cell"
item_state = "cell"
@@ -164,7 +164,7 @@
/* Cell variants*/
/obj/item/weapon/stock_parts/cell/crap
- name = "\improper Nanotrasen brand rechargable AA battery"
+ name = "\improper Nanotrasen brand rechargeable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
maxcharge = 500
materials = list(MAT_GLASS=40)
@@ -175,7 +175,7 @@
charge = 0
/obj/item/weapon/stock_parts/cell/secborg
- name = "security borg rechargable D battery"
+ name = "security borg rechargeable D battery"
origin_tech = null
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
materials = list(MAT_GLASS=40)
@@ -247,7 +247,7 @@
/obj/item/weapon/stock_parts/cell/bluespace
name = "bluespace power cell"
- desc = "A rechargable transdimensional power cell."
+ desc = "A rechargeable transdimensional power cell."
origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
icon_state = "bscell"
maxcharge = 40000
@@ -287,7 +287,7 @@
/obj/item/weapon/stock_parts/cell/potato
name = "potato battery"
- desc = "A rechargable starch based power cell."
+ desc = "A rechargeable starch based power cell."
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "potato"
origin_tech = "powerstorage=1;biotech=1"
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 36804b61215..4f4f956403c 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -400,7 +400,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
// Misc
-/obj/item/weapon/paper/gravity_gen
+/obj/item/weapon/paper/guides/jobs/engi/gravity_gen
name = "paper- 'Generate your own gravity!'"
info = {"Gravity Generator Instructions For Dummies
Surprisingly, gravity isn't that hard to make! All you have to do is inject deadly radioactive minerals into a ball of
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 7729fdf99a6..90c33bb6b3f 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -30,7 +30,7 @@
/obj/singularity/narsie/large/Initialize()
. = ..()
send_to_playing_players("NAR-SIE HAS RISEN")
- sound_to_playing_players("im_here")
+ sound_to_playing_players('sound/creatures/narsie_rises.ogg')
var/area/A = get_area(src)
if(A)
@@ -44,17 +44,11 @@
var/souls = 0
var/resolved = FALSE
-/obj/singularity/narsie/large/cult/proc/resize(var/ratio)
- var/matrix/ntransform = matrix(transform) //aka transform.Copy()
- ntransform.Scale(ratio)
- animate(src, transform = ntransform, time = 40, easing = EASE_IN|EASE_OUT)
-
/obj/singularity/narsie/large/cult/Initialize()
. = ..()
GLOB.cult_narsie = src
deltimer(GLOB.blood_target_reset_timer)
GLOB.blood_target = src
- resize(0.6)
for(var/datum/mind/cult_mind in SSticker.mode.cult)
if(isliving(cult_mind.current))
var/mob/living/L = cult_mind.current
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 0da3841bd7e..fc07ff03b05 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -493,6 +493,6 @@
// MISC
//
-/obj/item/weapon/paper/solar
+/obj/item/weapon/paper/guides/jobs/engi/solars
name = "paper- 'Going green! Setup your own solar array instructions.'"
info = "
Welcome
At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or plasma! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.
You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!
Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.
Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.
That's all to it, be safe, be green!
"
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index b37c8aadca2..e80b4cd9b6d 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -63,7 +63,7 @@
density = TRUE
anchored = FALSE
light_range = 4
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
critical_machine = TRUE
@@ -131,8 +131,6 @@
var/produces_gas = TRUE
var/obj/effect/countdown/supermatter/countdown
-/obj/machinery/power/supermatter_shard/make_frozen_visual()
- return
/obj/machinery/power/supermatter_shard/Initialize()
. = ..()
diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm
index 5653e804224..966ef2f9e2e 100644
--- a/code/modules/procedural_mapping/mapGenerator.dm
+++ b/code/modules/procedural_mapping/mapGenerator.dm
@@ -17,7 +17,6 @@
//All
#define CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all
-
/datum/mapGenerator
//Map information
@@ -26,8 +25,12 @@
//mapGeneratorModule information
var/list/modules = list()
+ var/buildmode_name = "Undocumented"
+
/datum/mapGenerator/New()
..()
+ if(buildmode_name == "Undocumented")
+ buildmode_name = copytext("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters.
initialiseModules()
//Defines the region the map represents, sets map
diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
index 4d07342051d..6216216cd9a 100644
--- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
@@ -20,13 +20,25 @@
/datum/mapGeneratorModule/bottomLayer/massdelete
spawnableAtoms = list()
spawnableTurfs = list()
+ var/deletemobs = TRUE
+ var/deleteturfs = TRUE
/datum/mapGeneratorModule/bottomLayer/massdelete/generate()
if(!mother)
return
for(var/V in mother.map)
var/turf/T = V
- T.empty()
+ T.empty(deleteturfs? null : T.type, delmobs = deletemobs, forceop = TRUE)
+
+/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs
+ deletemobs = FALSE
+
+/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs
+ deleteturfs = FALSE
+
+/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete
+ deletemobs = FALSE
+ deleteturfs = FALSE
//Only places atoms/turfs on area borders
/datum/mapGeneratorModule/border
diff --git a/code/modules/procedural_mapping/mapGenerators/asteroid.dm b/code/modules/procedural_mapping/mapGenerators/asteroid.dm
index 1c31bb5697c..35690058c99 100644
--- a/code/modules/procedural_mapping/mapGenerators/asteroid.dm
+++ b/code/modules/procedural_mapping/mapGenerators/asteroid.dm
@@ -29,17 +29,21 @@
/datum/mapGenerator/asteroid/hollow
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
/datum/mapGeneratorModule/border/asteroidWalls)
+ buildmode_name = "Pattern: Asteroid Room \[AIRLESS!\]"
/datum/mapGenerator/asteroid/hollow/random
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
/datum/mapGeneratorModule/border/asteroidWalls, \
/datum/mapGeneratorModule/splatterLayer/asteroidWalls)
+ buildmode_name = "Pattern: Asteroid Room: Splatter Walls \[AIRLESS!\]"
/datum/mapGenerator/asteroid/hollow/random/monsters
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
/datum/mapGeneratorModule/border/asteroidWalls, \
/datum/mapGeneratorModule/splatterLayer/asteroidWalls, \
/datum/mapGeneratorModule/splatterLayer/asteroidMonsters)
+ buildmode_name = "Pattern: Asteroid Room: Splatter Walls + Monsters \[AIRLESS!\]"
/datum/mapGenerator/asteroid/filled
- modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls)
\ No newline at end of file
+ modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls)
+ buildmode_name = "Block: Asteroid Walls"
\ No newline at end of file
diff --git a/code/modules/procedural_mapping/mapGenerators/cult.dm b/code/modules/procedural_mapping/mapGenerators/cult.dm
index c76a611b7e8..ea9c7da9460 100644
--- a/code/modules/procedural_mapping/mapGenerators/cult.dm
+++ b/code/modules/procedural_mapping/mapGenerators/cult.dm
@@ -4,28 +4,30 @@
/datum/mapGeneratorModule/border/cultWalls
spawnableTurfs = list(/turf/closed/wall/mineral/cult = 100)
-
/datum/mapGeneratorModule/bottomLayer/clockFloor
spawnableTurfs = list(/turf/open/floor/clockwork = 100)
/datum/mapGeneratorModule/border/clockWalls
spawnableTurfs = list(/turf/closed/wall/clockwork = 100)
-
/datum/mapGenerator/cult //walls and floor only
- modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \
+ modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \
/datum/mapGeneratorModule/border/cultWalls, \
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Cult Room"
/datum/mapGenerator/clock //walls and floor only
- modules = list(/datum/mapGeneratorModule/bottomLayer/clockFloor, \
+ modules = list(/datum/mapGeneratorModule/bottomLayer/clockFloor, \
/datum/mapGeneratorModule/border/clockWalls, \
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Clockwork Room"
/datum/mapGenerator/cult/floor //floors only
- modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \
+ modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Block: Cult Floor"
/datum/mapGenerator/clock/floor //floor only
- modules = list(/datum/mapGeneratorModule/bottomLayer/clockFloor, \
- /datum/mapGeneratorModule/bottomLayer/repressurize)
\ No newline at end of file
+ modules = list(/datum/mapGeneratorModule/bottomLayer/clockFloor, \
+ /datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Block: Clockwork Floor"
diff --git a/code/modules/procedural_mapping/mapGenerators/lava_river.dm b/code/modules/procedural_mapping/mapGenerators/lava_river.dm
index 336a7786acb..8bdedb4b765 100644
--- a/code/modules/procedural_mapping/mapGenerators/lava_river.dm
+++ b/code/modules/procedural_mapping/mapGenerators/lava_river.dm
@@ -1,3 +1,4 @@
+
/datum/mapGenerator/lavaland
var/start_z = 5
var/min_x = 0
@@ -5,6 +6,7 @@
var/max_x = 0
var/max_y = 0
modules = list(/datum/mapGeneratorModule/river)
+ buildmode_name = "Pattern: Lava Rivers"
/datum/mapGenerator/lavaland/defineRegion(turf/Start, turf/End, replace = 0)
start_z = Start.z
@@ -15,7 +17,7 @@
..()
/datum/mapGeneratorModule/river
- var/river_type = /turf/open/floor/plating/lava/smooth
+ var/river_type = /turf/open/lava/smooth
var/river_nodes = 4
var/start_z = 5
diff --git a/code/modules/procedural_mapping/mapGenerators/lavaland.dm b/code/modules/procedural_mapping/mapGenerators/lavaland.dm
index 9c160ee8488..e6d7b00e8d9 100644
--- a/code/modules/procedural_mapping/mapGenerators/lavaland.dm
+++ b/code/modules/procedural_mapping/mapGenerators/lavaland.dm
@@ -22,9 +22,12 @@
/datum/mapGenerator/lavaland/ground_only
modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_default)
+ buildmode_name = "Block: Lavaland Floor"
/datum/mapGenerator/lavaland/dense_ores
modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense)
+ buildmode_name = "Block: Lavaland Ores: Dense"
/datum/mapGenerator/lavaland/normal_ores
modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral)
+ buildmode_name = "Block: Lavaland Ores"
diff --git a/code/modules/procedural_mapping/mapGenerators/nature.dm b/code/modules/procedural_mapping/mapGenerators/nature.dm
index 6ad1dfcf7e1..abb4e7ed105 100644
--- a/code/modules/procedural_mapping/mapGenerators/nature.dm
+++ b/code/modules/procedural_mapping/mapGenerators/nature.dm
@@ -8,4 +8,4 @@
/datum/mapGeneratorModule/randBushes, \
/datum/mapGeneratorModule/randRocks, \
/datum/mapGeneratorModule/denseLayer/grassTufts)
-
+ buildmode_name = "Pattern: Nature"
diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm
index 3a344ac94a5..f9b94bba89d 100644
--- a/code/modules/procedural_mapping/mapGenerators/repair.dm
+++ b/code/modules/procedural_mapping/mapGenerators/repair.dm
@@ -16,16 +16,92 @@
spawnableTurfs = list(/turf/closed/wall = 100)
allowAtomsOnSpace = TRUE
+/datum/mapGeneratorModule/reload_station_map/generate()
+ if(!istype(mother, /datum/mapGenerator/repair/reload_station_map))
+ return
+ var/datum/mapGenerator/repair/reload_station_map/mother1 = mother
+ if(mother1.z != ZLEVEL_STATION)
+ return //This is only for reloading station blocks!
+ GLOB.reloading_map = TRUE
+ var/static/dmm_suite/reloader = new
+ var/list/bounds = reloader.load_map(file(SSmapping.config.GetFullMapPath()),measureOnly = FALSE, no_changeturf = FALSE,x_offset = 0, y_offset = 0, z_offset = ZLEVEL_STATION, cropMap=TRUE, lower_crop_x = mother1.x_low, lower_crop_y = mother1.y_low, upper_crop_x = mother1.x_high, upper_crop_y = mother1.y_high)
+
+ var/list/obj/machinery/atmospherics/atmos_machines = list()
+ var/list/obj/structure/cable/cables = list()
+ var/list/atom/atoms = list()
+
+ repopulate_sorted_areas()
+
+ for(var/L in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]),
+ locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))
+ set waitfor = FALSE
+ var/turf/B = L
+ atoms += B
+ for(var/A in B)
+ atoms += A
+ if(istype(A,/obj/structure/cable))
+ cables += A
+ continue
+ if(istype(A,/obj/machinery/atmospherics))
+ atmos_machines += A
+
+ SSatoms.InitializeAtoms(atoms)
+ SSmachines.setup_template_powernets(cables)
+ SSair.setup_template_machinery(atmos_machines)
+ GLOB.reloading_map = FALSE
+
/datum/mapGenerator/repair
modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel,
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Repair: Floor"
/datum/mapGenerator/repair/delete_walls
modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten,
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Repair: Floor: Flatten Walls"
/datum/mapGenerator/repair/enclose_room
modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten,
/datum/mapGeneratorModule/border/normalWalls,
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Repair: Generate Aired Room"
+/datum/mapGenerator/repair/reload_station_map
+ modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs)
+ var/x_low = 0
+ var/x_high = 0
+ var/y_low = 0
+ var/y_high = 0
+ var/z = 0
+ var/cleanload = FALSE
+ var/datum/mapGeneratorModule/reload_station_map/loader
+ buildmode_name = "Repair: Reload Block \[DO NOT USE\]"
+
+/datum/mapGenerator/repair/reload_station_map/clean
+ buildmode_name = "Repair: Reload Block - Mass Delete"
+ cleanload = TRUE
+
+/datum/mapGenerator/repair/reload_station_map/clean/in_place
+ modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete)
+ buildmode_name = "Repair: Reload Block - Mass Delete - In Place"
+
+/datum/mapGenerator/repair/reload_station_map/defineRegion(turf/start, turf/end)
+ . = ..()
+ if(start.z != ZLEVEL_STATION || end.z != ZLEVEL_STATION)
+ return
+ x_low = min(start.x, end.x)
+ y_low = min(start.y, end.y)
+ x_high = max(start.x, end.x)
+ y_high = max(start.y, end.y)
+ z = ZLEVEL_STATION
+
+GLOBAL_VAR_INIT(reloading_map, FALSE)
+
+/datum/mapGenerator/repair/reload_station_map/generate(clean = cleanload)
+ if(!loader)
+ loader = new
+ if(cleanload)
+ ..() //Trigger mass deletion.
+ modules |= loader
+ syncModules()
+ loader.generate()
diff --git a/code/modules/procedural_mapping/mapGenerators/shuttle.dm b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
index b155335bdeb..7ce98040bb4 100644
--- a/code/modules/procedural_mapping/mapGenerators/shuttle.dm
+++ b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
@@ -7,9 +7,11 @@
// Generators
/datum/mapGenerator/shuttle/full
- modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor, \
+ modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor, \
/datum/mapGeneratorModule/border/shuttleWalls,\
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Shuttle Room"
/datum/mapGenerator/shuttle/floor
modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor)
+ buildmode_name = "Block: Shuttle Floor"
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
index b8a6f33b33a..b5030f566db 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -1,3 +1,4 @@
+
// Modules
/turf/open/floor/plasteel/shuttle/red/syndicate
@@ -14,8 +15,8 @@
/datum/mapGeneratorModule/syndieFurniture
clusterCheckFlags = CLUSTER_CHECK_ALL
spawnableTurfs = list()
- spawnableAtoms = list(/obj/structure/table = 20, /obj/structure/chair = 15, /obj/structure/chair/stool = 10,
- /obj/structure/frame/computer = 15, /obj/item/weapon/storage/toolbox/syndicate = 15,
+ spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \
+ /obj/structure/frame/computer = 15, /obj/item/weapon/storage/toolbox/syndicate = 15 ,\
/obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15)
/datum/mapGeneratorModule/splatterLayer/syndieMobs
@@ -28,21 +29,24 @@
// Generators
/datum/mapGenerator/syndicate/empty //walls and floor only
- modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
+ modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
/datum/mapGeneratorModule/border/syndieWalls,\
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Shuttle Room: Syndicate"
/datum/mapGenerator/syndicate/mobsonly
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
/datum/mapGeneratorModule/border/syndieWalls,\
/datum/mapGeneratorModule/splatterLayer/syndieMobs, \
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Shuttle Room: Syndicate: Mobs"
/datum/mapGenerator/syndicate/furniture
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
/datum/mapGeneratorModule/border/syndieWalls,\
/datum/mapGeneratorModule/syndieFurniture, \
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Shuttle Room: Syndicate: Furniture"
/datum/mapGenerator/syndicate/full
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
@@ -50,3 +54,4 @@
/datum/mapGeneratorModule/syndieFurniture, \
/datum/mapGeneratorModule/splatterLayer/syndieMobs, \
/datum/mapGeneratorModule/bottomLayer/repressurize)
+ buildmode_name = "Pattern: Shuttle Room: Syndicate: All"
diff --git a/code/modules/projectiles/ammunition/caseless.dm b/code/modules/projectiles/ammunition/caseless.dm
index 76861232b93..17693ae5e35 100644
--- a/code/modules/projectiles/ammunition/caseless.dm
+++ b/code/modules/projectiles/ammunition/caseless.dm
@@ -114,12 +114,3 @@
desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up."
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot
icon_state = "foamdart_riot"
-
-/obj/item/ammo_casing/caseless/arrow
- name = "arrow"
- desc = "Stab, stab, stab."
- icon_state = "arrow"
- force = 10
- sharpness = IS_SHARP
- projectile_type = /obj/item/projectile/bullet/reusable/arrow
- caliber = "arrow"
diff --git a/code/modules/projectiles/boxes_magazines/internal_mag.dm b/code/modules/projectiles/boxes_magazines/internal_mag.dm
index 9476d728a62..3a8b4e6f2f1 100644
--- a/code/modules/projectiles/boxes_magazines/internal_mag.dm
+++ b/code/modules/projectiles/boxes_magazines/internal_mag.dm
@@ -188,10 +188,3 @@
ammo_type = /obj/item/ammo_casing/caseless/laser/gatling
caliber = "gatling"
max_ammo = 5000
-
-
-/obj/item/ammo_box/magazine/internal/bow
- name = "bow internal magazine"
- ammo_type = /obj/item/ammo_casing/caseless/arrow
- caliber = "arrow"
- max_ammo = 1
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 39f08d2519a..1b552972423 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -91,6 +91,11 @@
else
to_chat(user, "It doesn't have a firing pin installed, and won't fire.")
+/obj/item/weapon/gun/equipped(mob/living/user, slot)
+ . = ..()
+ if(zoomable && user.get_active_held_item() != src)
+ zoom(user, FALSE) //we can only stay zoomed in if it's in our hands
+
//called after the gun has successfully fired its chambered ammo.
/obj/item/weapon/gun/proc/process_chamber()
return 0
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index e5edf19e0cc..3666cab17a1 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -9,7 +9,7 @@
actions_types = list(/datum/action/item_action/toggle_firemode)
/obj/item/weapon/gun/ballistic/automatic/proto
- name = "\improper NanoTrasen Saber SMG"
+ name = "\improper Nanotrasen Saber SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
@@ -412,7 +412,7 @@
/obj/item/weapon/gun/ballistic/automatic/laser
name = "laser rifle"
- desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargable ammunition has given Nanotrasen a decisive edge over many a foe."
+ desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargeable ammunition has given Nanotrasen a decisive edge over many a foe."
icon_state = "oldrifle"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/recharge
diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm
deleted file mode 100644
index 89a5faa9283..00000000000
--- a/code/modules/projectiles/guns/ballistic/bow.dm
+++ /dev/null
@@ -1,109 +0,0 @@
-/obj/item/weapon/gun/ballistic/bow
- name = "bow"
- desc = "A sturdy bow made out of wood and reinforced with iron."
- icon_state = "bow_unloaded"
- item_state = "bow"
- var/icon_state_loaded = "bow_loaded"
- var/icon_state_firing = "bow_firing"
- var/item_state_loaded = "bow"
- var/item_state_firing = "bow"
- fire_sound = 'sound/weapons/grenadelaunch.ogg'
- mag_type = /obj/item/ammo_box/magazine/internal/bow
- weapon_weight = WEAPON_HEAVY
- var/draw_sound = 'sound/weapons/draw_bow.ogg'
- var/ready_to_fire = 0
- var/slowdown_when_ready = 2
-
-/obj/item/weapon/gun/ballistic/bow/Initialize(mapload)
- . = ..()
- SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
-
-/obj/item/weapon/gun/ballistic/bow/update_icon()
- if(ready_to_fire)
- icon_state = icon_state_firing
- item_state = item_state_firing
- slowdown = slowdown_when_ready
- else if(magazine.ammo_count() && !ready_to_fire)
- icon_state = icon_state_loaded
- item_state = item_state_loaded
- slowdown = initial(slowdown)
- else
- icon_state = initial(icon_state)
- item_state = initial(item_state)
- slowdown = initial(slowdown)
-
-/obj/item/weapon/gun/ballistic/bow/dropped(mob/user)
- if(magazine && magazine.ammo_count())
- magazine.empty_magazine()
- ready_to_fire = FALSE
- update_icon()
-
-/obj/item/weapon/gun/ballistic/bow/attack_self(mob/living/user)
- if(!ready_to_fire && magazine.ammo_count())
- ready_to_fire = TRUE
- playsound(user, draw_sound, 100, 1)
- update_icon()
- else
- ready_to_fire = FALSE
- update_icon()
-
-/obj/item/weapon/gun/ballistic/bow/attackby(obj/item/A, mob/user, params)
- var/num_loaded = magazine.attackby(A, user, params, 1)
- if(num_loaded)
- to_chat(user, "You ready \the [A] into \the [src].")
- update_icon()
- chamber_round()
-
-/obj/item/weapon/gun/ballistic/bow/can_shoot()
- . = ..()
- if(!ready_to_fire)
- return FALSE
-
-/obj/item/weapon/gun/ballistic/bow/shoot_with_empty_chamber(mob/living/user as mob|obj)
- return
-
-/obj/item/weapon/gun/ballistic/bow/process_chamber(eject_casing = 0, empty_chamber = 1)
- . = ..()
- ready_to_fire = FALSE
- update_icon()
-
-// ammo
-/obj/item/ammo_box/magazine/internal/bow
- name = "bow internal magazine"
- ammo_type = /obj/item/ammo_casing/caseless/arrow
- caliber = "arrow"
- max_ammo = 1
-
-
-/obj/item/projectile/bullet/reusable/arrow
- name = "arrow"
- icon_state = "arrow"
- ammo_type = /obj/item/ammo_casing/caseless/arrow
- range = 10
- damage = 25
- damage_type = BRUTE
-
-/obj/item/ammo_casing/caseless/arrow
- name = "arrow"
- desc = "Stab, stab, stab."
- icon_state = "arrow"
- force = 10
- sharpness = IS_SHARP
- projectile_type = /obj/item/projectile/bullet/reusable/arrow
- caliber = "arrow"
-
-//quiver
-/obj/item/weapon/storage/backpack/quiver
- name = "quiver"
- desc = "A quiver for holding arrows."
- icon_state = "quiver"
- item_state = "quiver"
- storage_slots = 20
- can_hold = list(
- /obj/item/ammo_casing/caseless/arrow
- )
-
-/obj/item/weapon/storage/backpack/quiver/full/New()
- ..()
- for(var/i in 1 to storage_slots)
- new /obj/item/ammo_casing/caseless/arrow(src)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index c877eec9eca..b30c5277ec5 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -223,10 +223,10 @@
Angle=round(Get_Angle(src,current))
if(spread)
Angle += (rand() - 0.5) * spread
- var/matrix/M = new
if(!nondirectional_sprite)
+ var/matrix/M = new
M.Turn(Angle)
- transform = M
+ transform = M
var/Pixel_x=round((sin(Angle)+16*sin(Angle)*2), 1) //round() is a floor operation when only one argument is supplied, we don't want that here
var/Pixel_y=round((cos(Angle)+16*cos(Angle)*2), 1)
diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm
index 5d03806d391..9a2c12c03db 100644
--- a/code/modules/projectiles/projectile/reusable.dm
+++ b/code/modules/projectiles/projectile/reusable.dm
@@ -67,11 +67,3 @@
icon_state = "foamdart_riot_proj"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
stamina = 25
-
-/obj/item/projectile/bullet/reusable/arrow
- name = "arrow"
- icon_state = "arrow"
- ammo_type = /obj/item/ammo_casing/caseless/arrow
- range = 10
- damage = 25
- damage_type = BRUTE
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 1685eeb72db..46597fb0280 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -46,10 +46,11 @@
var/list/this = list()
this["name"] = D.name
if(istype(D, /datum/disease/advance))
- var/datum/disease/advance/A = SSdisease.archive_diseases[D.GetDiseaseID()]
- if(A.name == "Unknown")
+ var/datum/disease/advance/A = D
+ var/datum/disease/advance/archived = SSdisease.archive_diseases[D.GetDiseaseID()]
+ if(archived.name == "Unknown")
this["can_rename"] = TRUE
- this["name"] = A.name
+ this["name"] = archived.name
this["is_adv"] = TRUE
this["resistance"] = A.totalResistance()
this["stealth"] = A.totalStealth()
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index bd659d95cde..876029e1282 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -407,7 +407,7 @@
return
to_chat(H, "You crumple in agony as your flesh wildly morphs into new forms!")
H.visible_message("[H] falls to the ground and screams as [H.p_their()] skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
- H.Knockdown(60, 0)
+ H.Knockdown(60)
addtimer(CALLBACK(src, .proc/mutate, H), 30)
return
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index b536dc962a4..d0dadc271e2 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -283,13 +283,17 @@
. = 1
..()
-/datum/reagent/toxin/chloralhydrate/delayed
+/datum/reagent/toxin/chloralhydratedelayed
+ name = "Chloral Hydrate"
id = "chloralhydrate2"
+ description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep."
+ reagent_state = SOLID
+ color = "#000067" // rgb: 0, 0, 103
+ toxpwr = 0
+ metabolization_rate = 1.5 * REAGENTS_METABOLISM
-/datum/reagent/toxin/chloralhydrate/delayed/on_mob_life(mob/living/M)
+/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/M)
switch(current_cycle)
- if(1 to 10)
- return
if(10 to 20)
M.confused += 1
M.drowsyness += 1
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index ddc1c566577..0d0a4f76957 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -347,6 +347,6 @@
transfer_fingerprints_to(NC)
qdel(src)
-/obj/item/weapon/paper/conveyor
+/obj/item/weapon/paper/guides/conveyor
name = "paper- 'Nano-it-up U-build series, #9: Build your very own conveyor belt, in SPACE'"
info = "Congratulations!
You are now the proud owner of the best conveyor set available for space mail order! We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined assembly procedure that puts all other mail-order products to shame!
Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see! This convenience, you can only have it when you Nano-it-up. Stay nano!
"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 0f267aa3118..8b90339b028 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -387,3 +387,35 @@
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/weapon/implantcase/track
category = list("Medical Designs")
+
+//Cybernetic organs
+
+/datum/design/cybernetic_liver
+ name = "Cybernetic Liver"
+ desc = "A cybernetic liver"
+ id = "cybernetic_liver"
+ req_tech = list("biotech" = 4, "materials" = 4)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+ build_path = /obj/item/organ/liver/cybernetic
+ category = list("Medical Designs")
+
+/datum/design/cybernetic_heart
+ name = "Cybernetic Heart"
+ desc = "A cybernetic heart"
+ id = "cybernetic_heart"
+ req_tech = list("biotech" = 4, "materials" = 4)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+ build_path = /obj/item/organ/heart/cybernetic
+ category = list("Medical Designs")
+
+/datum/design/cybernetic_liver_u
+ name = "Upgraded Cybernetic Liver"
+ desc = "An upgraded cybernetic liver"
+ id = "cybernetic_liver_u"
+ req_tech = list("biotech" = 5, "materials" = 5, "plasmatech" = 5)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+ build_path = /obj/item/organ/liver/cybernetic/upgraded
+ category = list("Medical Designs")
diff --git a/code/modules/ruins/lavalandruin_code/sloth.dm b/code/modules/ruins/lavalandruin_code/sloth.dm
new file mode 100644
index 00000000000..7253f48e97c
--- /dev/null
+++ b/code/modules/ruins/lavalandruin_code/sloth.dm
@@ -0,0 +1,5 @@
+/////////// lavaland slot ruin items
+
+/obj/item/weapon/paper/fluff/stations/lavaland/sloth/note
+ name = "note from sloth"
+ desc = "have not gotten around to finishing my cursed item yet sorry - sloth"
\ No newline at end of file
diff --git a/code/modules/ruins/lavalandruin_code/surface.dm b/code/modules/ruins/lavalandruin_code/surface.dm
new file mode 100644
index 00000000000..4da89f2abe7
--- /dev/null
+++ b/code/modules/ruins/lavalandruin_code/surface.dm
@@ -0,0 +1,5 @@
+//////lavaland surface papers
+
+/obj/item/weapon/paper/fluff/stations/lavaland/surface/henderson_report
+ name = "Important Notice - Mrs. Henderson"
+ info = "Nothing of interest to report."
\ No newline at end of file
diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
index e0452df7a8d..516cff87a25 100644
--- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
@@ -258,7 +258,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
if(falling || fallen)
return
var/turf/T = get_turf(src)
- if(!istype(T, /turf/open/floor/plating/lava) && !istype(T, /turf/open/chasm)) //nothing to sink or fall into
+ if(!istype(T, /turf/open/lava) && !istype(T, /turf/open/chasm)) //nothing to sink or fall into
return
var/obj/item/I
if(istype(AM, /obj/item))
diff --git a/code/modules/ruins/objects_and_mobs/ruin_mapping_aids.dm b/code/modules/ruins/objects_and_mobs/ruin_mapping_aids.dm
index 669890a279a..06fb2b9c041 100644
--- a/code/modules/ruins/objects_and_mobs/ruin_mapping_aids.dm
+++ b/code/modules/ruins/objects_and_mobs/ruin_mapping_aids.dm
@@ -4,7 +4,8 @@
name = "lava baseturf editor"
icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon"
- var/baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+ var/baseturf = /turf/open/lava/smooth/lava_land_surface
+ layer = POINT_LAYER
/obj/effect/baseturf_helper/Initialize()
. = ..()
diff --git a/code/modules/ruins/spaceruin_code/DJstation.dm b/code/modules/ruins/spaceruin_code/DJstation.dm
new file mode 100644
index 00000000000..7fbe3e93009
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/DJstation.dm
@@ -0,0 +1,5 @@
+/////////// djstation items
+
+/obj/item/weapon/paper/fluff/ruins/djstation
+ name = "paper - 'DJ Listening Outpost'"
+ info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio frequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multitool
- Use the multitool on the relay.
- Turn it on. It has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms. They are located on the front desk. Here is a list of frequencies for you to listen on.
- 145.9 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Service Channel
- 134.7 - Supply Channel
"
diff --git a/code/modules/ruins/spaceruin_code/TheDerelict.dm b/code/modules/ruins/spaceruin_code/TheDerelict.dm
new file mode 100644
index 00000000000..e7b55411fb2
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/TheDerelict.dm
@@ -0,0 +1,13 @@
+/////////// thederelict items
+
+/obj/item/weapon/paper/fluff/ruins/thederelict/equipment
+ info = "If the equipment breaks there should be enough spare parts in our engineering storage near the north east solar array."
+ name = "Equipment Inventory"
+
+/obj/item/weapon/paper/fluff/ruins/thederelict/syndie_mission
+ name = "Mission Objectives"
+ info = "The Syndicate have cunningly disguised a Syndicate Uplink as your PDA. Simply enter the code \"678 Bravo\" into the ringtone select to unlock its hidden features.
Objective #1. Kill the God damn AI in a fire blast that it rocks the station. Success!
Objective #2. Escape alive. Failed."
+
+/obj/item/weapon/paper/fluff/ruins/thederelict/nukie_objectives
+ name = "Objectives of a Nuclear Operative"
+ info = "Objective #1: Destroy the station with a nuclear device."
\ No newline at end of file
diff --git a/code/modules/ruins/spaceruin_code/asteroid4.dm b/code/modules/ruins/spaceruin_code/asteroid4.dm
new file mode 100644
index 00000000000..eca2b4252c3
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/asteroid4.dm
@@ -0,0 +1,4 @@
+/////////// asteroid4 items
+
+/obj/item/weapon/paper/fluff/ruins/asteroid4/extraction
+ info = "Extraction was successful! The disguise was perfect, the clowns never knew what hit 'em! Once I get back to base with the bananium samples I'll be rich, I tell you! RICH!"
diff --git a/code/modules/ruins/spaceruin_code/crashedclownship.dm b/code/modules/ruins/spaceruin_code/crashedclownship.dm
new file mode 100644
index 00000000000..f927b7be737
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/crashedclownship.dm
@@ -0,0 +1,4 @@
+/////////// crashedclownship items
+
+/obj/item/weapon/paper/fluff/ruins/crashedclownship/true_nation
+ info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!"
diff --git a/code/modules/ruins/spaceruin_code/crashedship.dm b/code/modules/ruins/spaceruin_code/crashedship.dm
new file mode 100644
index 00000000000..e7d07dafb56
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/crashedship.dm
@@ -0,0 +1,15 @@
+/////////// crashedship items
+
+/obj/item/weapon/paper/fluff/ruins/crashedship/scribbled
+ name = "scribbled note"
+ info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"
+
+
+/obj/item/weapon/paper/fluff/ruins/crashedship/captains_log
+ name = "Captain's log entry"
+ info = "I'm no scientist, but judging from the design and components, it seems to be some kind of teleporter. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."
+
+/obj/item/weapon/paper/fluff/ruins/crashedship/old_diary
+ name = "Old Diary"
+ info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."
+
diff --git a/code/modules/ruins/spaceruin_code/deepstorage.dm b/code/modules/ruins/spaceruin_code/deepstorage.dm
new file mode 100644
index 00000000000..97fc360d7c8
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/deepstorage.dm
@@ -0,0 +1,14 @@
+/////////// deepstorage items
+
+/obj/item/weapon/paper/fluff/ruins/deepstorage/water_concern
+ name = "water concerns"
+ info = "To whoever keeps it up with the long, hot showers: you're going on the next ice-mining trip. If you feel the need to use up all the damn water during your 'relaxation' time, you sure as hell are gonna work for all that water!"
+
+/obj/item/weapon/paper/fluff/ruins/deepstorage/hydro_notice
+ name = "hydroponics notice"
+ info = "Hydroponics is our life and blood here, if it dies then so do we. Keep the damn plants watered!"
+
+/obj/item/weapon/paper/fluff/ruins/deepstorage/recycling_notice
+ name = "recycling notice"
+ info = "Please make sure to throw all excess waste into the crusher in the back! It's amazing what you can get out of what others consider 'garbage' if you run it through a giant crusher enough times."
+
diff --git a/code/modules/ruins/spaceruin_code/listeningstation.dm b/code/modules/ruins/spaceruin_code/listeningstation.dm
new file mode 100644
index 00000000000..9441ec3685e
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/listeningstation.dm
@@ -0,0 +1,45 @@
+/////////// listening station
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports
+ info = "Nothing of interest to report."
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/july
+ name = "july report"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/august
+ name = "august report"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/september
+ name = "september report"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/october
+ name = "october report"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/november
+ name = "november report"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/june
+ name = "june report"
+ info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/may
+ name = "may report"
+ info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/april
+ name = "april report"
+ info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/receipt
+ name = "receipt"
+ info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/odd_report
+ name = "odd report"
+ info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"
+
+/obj/item/weapon/paper/fluff/ruins/listeningstation/briefing
+ name = "mission briefing"
+ info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."
+
+
diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm
new file mode 100644
index 00000000000..52b2f5313cf
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/oldstation.dm
@@ -0,0 +1,49 @@
+/////////// Oldstation items
+
+/obj/item/weapon/paper/fluff/ruins/oldstation
+ name = "Cyro Awakening Alert"
+ info = "**WARNING**
Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.
Immediate Objectives
1: Activate emergency power generator
2: Lift station lockdown on the bridge
Please locate the 'Damage Report' on the bridge for a detailed situation report."
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/damagereport
+ name = "Damage Report"
+ info = "*Damage Report*
Alpha Station - Destroyed
Beta Station - Catastrophic Damage. Medical, destroyed. Atmospherics, partially destroyed. Engine Core, destroyed.
Charlie Station - Intact. Loss of oxygen to eastern side of main corridor.
Delta Station - Intact. WARNING: Unknown force occupying Delta Station. Intent unknown. Species unknown. Numbers unknown.
Recommendation - Reestablish station powernet via solar array. Reestablish station atmospherics system to restore air."
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/protosuit
+ name = "B01-RIG Hardsuit Report"
+ info = "*Prototype Hardsuit*
The B01-RIG Hardsuit is a prototype powered exoskeleton. Based off of a recovered pre-void war era united earth government powered military \
+ exosuit, the RIG Hardsuit is a breakthrough in Hardsuit technology, and is the first post-void war era Hardsuit that can be safely used by a operator.
The B01 however suffers \
+ a myriad of constraints. It is slow and bulky to move around, it lacks any significant armor plating against direct attacks and its internal heads up display is unfinished, \
+ resulting in the user being unable to see long distances.
The B01 is unlikely to see any form of mass production, but will serve as a base for future Hardsuit developments."
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/protohealth
+ name = "Health Analyser Report"
+ info = "*Health Analyser*
The portable Health Analyser is essentially a handheld varient of a health analyser. Years of research have concluded with this device which is \
+ capable of diagnosing even the most critical, obscure or technical injuries any humanoid entity is suffering in a easy to understand format that even a non-trained health professional \
+ can understand.
The health analyser is expected to go into full production as standard issue medical kit."
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/protogun
+ name = "K14 Energy Gun Report"
+ info = "*K14-Multiphase Energy Gun*
The K14 Prototype Energy Gun is the first Energy Rifle that has been successfully been able to not only hold a larger ammo charge \
+ than other gun models, but is capable of swapping between different energy projectile types on command with no incidents.
The weapon still suffers several drawbacks, its alternative, \
+ non laser fire mode, can only fire one round before exhausting the energy cell, the weapon also remains prohibitively expensive, nonetheless NT Market Research fully believe this weapon \
+ will form the backbone of our Energy weapon cataloge.
The K14 is expected to undergo revision to fix the ammo issues, the K15 is expected to replace the 'stun' setting with a \
+ 'disable' setting in a attempt to bypass the ammo issues."
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/protosing
+ name = "Singularity Generator"
+ info = "*Singularity Generator*
Modern power generation typically comes in two forms, a Fusion Generator or a Fission Generator. Fusion provides the best space to power \
+ ratio, and is typically seen on military or high security ships and stations, however Fission reactors require the usage of expensive, and rare, materials in its construction.. Fission generators are massive and bulky, and require a large reserve of uranium to power, however they are extremely cheap to operate and oft need little maintenance once \
+ operational.
The Singularity aims to alter this, a functional Singularity is essentially a controlled Black Hole, a Black Hole that generates far more power than Fusion or Fission \
+ generators can ever hope to produce. "
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/protoinv
+ name = "Laboratory Inventory"
+ info = "*Inventory*
(1) Prototype Hardsuit
(1)Health Analyser
(1)Prototype Energy Gun
(1)Singularity Generation Disk
DO NOT REMOVE WITHOUT \
+ THE CAPTAIN AND RESEARCH DIRECTOR'S AUTHORISATION"
+
+/obj/item/weapon/paper/fluff/ruins/oldstation/report
+ name = "Crew Reawakening Report"
+ info = "Artifical Program's report to surviving crewmembers.
Crew were placed into cryostasis on March 10th, 2445.
Crew were awoken from cryostasis around June, 2557.
\
+ SIGNIFICANT EVENTS OF NOTE
1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radioation detectors showed no residual \
+ radioation on station. Deduction, primariy detector was malfunctioning and was producing a radioation signal when there was none.
2: A data burst from a nearby Nanotrasen Space \
+ Station was recieved, this data burst contained research data that has been uploaded to our RnD labs.
3: Unknown invasion force has occupied Delta station."
diff --git a/code/modules/ruins/spaceruin_code/originalcontent.dm b/code/modules/ruins/spaceruin_code/originalcontent.dm
new file mode 100644
index 00000000000..ade3e3cb21e
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/originalcontent.dm
@@ -0,0 +1,4 @@
+/////////// originalcontent items
+
+/obj/item/weapon/paper/crumpled/ruins/originalcontent
+ desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings."
\ No newline at end of file
diff --git a/code/modules/ruins/spaceruin_code/spacehotel.dm b/code/modules/ruins/spaceruin_code/spacehotel.dm
new file mode 100644
index 00000000000..843cfa860c4
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/spacehotel.dm
@@ -0,0 +1,12 @@
+/////////// spacehotel items
+
+
+/obj/item/weapon/paper/fluff/ruins/spacehotel/notice
+ name = "!NOTICE!"
+ info = "!NOTICE!
We are expecting arriving guests soon from a nearby station! Stay sharp and make sure guests enjoy their time spent here. Don't think you can sneak off while they're here, either."
+
+/obj/item/weapon/paper/pamphlet/ruin/spacehotel
+ name = "hotel pamphlet"
+ info = "The Twin Nexus Hotel
A place of Sanctuary
Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff stride to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more infomation."
+
+
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 237b42bd0f2..ea1bcd583fc 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -55,7 +55,7 @@ All ShuttleMove procs go here
new_open.copy_air_with_tile(src)
//Source turf changes
- ChangeTurf(turf_type, FALSE, TRUE, baseturf_type)
+ ChangeTurf(turf_type, baseturf_type, FALSE, TRUE)
return TRUE
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index d25fc4ab95a..e15dc3f0763 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -177,7 +177,7 @@
for(var/i in 1 to assigned_turfs.len)
var/turf/T = assigned_turfs[i]
if(T.type == turf_type)
- T.ChangeTurf(/turf/open/space,new_baseturf=/turf/open/space)
+ T.ChangeTurf(/turf/open/space,/turf/open/space)
T.flags |= UNUSED_TRANSIT_TURF
/obj/docking_port/stationary/transit/Destroy(force=FALSE)
@@ -385,7 +385,7 @@
var/turf_type = /turf/open/space
var/baseturf_type = /turf/open/space
- var/area_type = /area/space
+ var/underlying_area_type = /area/space
// If the shuttle is docked to a stationary port, restore its normal
// "empty" area and turf
if(current_dock)
@@ -394,28 +394,21 @@
if(current_dock.baseturf_type)
baseturf_type = current_dock.baseturf_type
if(current_dock.area_type)
- area_type = current_dock.area_type
+ underlying_area_type = current_dock.area_type
- var/list/shuttle_turfs = return_ordered_turfs(x, y, z, dir, area_type)
+ var/list/old_turfs = return_ordered_turfs(x, y, z, dir, area_type)
+ var/area/underlying_area = locate(underlying_area_type) in GLOB.sortedAreas
+ if(!underlying_area)
+ underlying_area = new underlying_area_type(null)
- //remove area surrounding docking port
- for(var/i in 1 to shuttle_areas.len)
- var/area/shuttle_area = shuttle_areas[i]
- if(shuttle_area.contents.len)
- var/area/underlying_area = locate("[area_type]")
- if(!underlying_area)
- underlying_area = new area_type(null)
- for(var/ii in shuttle_turfs)
- var/turf/T = shuttle_turfs[ii]
- var/area/old_area = T.loc
- underlying_area.contents += T
- T.change_area(old_area, underlying_area)
-
- for(var/i in shuttle_turfs)
- var/turf/T = i
- if(!T)
+ for(var/i in 1 to old_turfs.len)
+ var/turf/oldT = old_turfs[i]
+ if(!oldT)
continue
- T.empty(turf_type, baseturf_type)
+ var/area/old_area = oldT.loc
+ underlying_area.contents += oldT
+ oldT.change_area(old_area, underlying_area)
+ oldT.empty(turf_type, baseturf_type)
qdel(src, force=TRUE)
@@ -575,6 +568,7 @@
var/area/internal_area = thing
internal_area.afterShuttleMove() //areas
+ check_poddoors()
new_dock.last_dock_time = world.time
setDir(new_dock.dir)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index c0d3714acfa..07a0d0bcee4 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -16,7 +16,12 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/structure/recieving_pad,
/obj/effect/clockwork/spatial_gateway,
/obj/structure/destructible/clockwork/powered/clockwork_obelisk,
- /obj/item/device/warp_cube
+ /obj/item/device/warp_cube,
+ /obj/machinery/r_n_d/protolathe, //print tracking beacons, send shuttle
+ /obj/machinery/autolathe, //same
+ /obj/item/projectile/beam/wormhole,
+ /obj/effect/portal,
+ /obj/item/device/shared_storage
)))
/obj/docking_port/mobile/supply
diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm
index 48523be917b..06347b849a2 100644
--- a/code/modules/spells/spell_types/mind_transfer.dm
+++ b/code/modules/spells/spell_types/mind_transfer.dm
@@ -17,7 +17,7 @@
/*
Urist: I don't feel like figuring out how you store object spells so I'm leaving this for you to do.
-Make sure spells that are removed from spell_list are actually removed and deleted when mind transfering.
+Make sure spells that are removed from spell_list are actually removed and deleted when mind transferring.
Also, you never added distance checking after target is selected. I've went ahead and did that.
*/
/obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets, mob/living/user = usr, distanceoverride)
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index dc1a4d0f641..f8388a5dab8 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -1,5 +1,6 @@
/obj/item/organ/heart
name = "heart"
+ desc = "I feel bad for the heartless bastard who lost this."
icon_state = "heart-on"
zone = "chest"
slot = "heart"
@@ -142,3 +143,12 @@
/datum/client_colour/cursed_heart_blood
priority = 100 //it's an indicator you're dieing, so it's very high priority
colour = "red"
+
+/obj/item/organ/heart/cybernetic
+ name = "cybernetic heart"
+ desc = "An electronic device designed to mimic the functions of an organic human heart. Offers no benefit over an organic heart other than being easy to make."
+ icon_state = "heart-c"
+ origin_tech = "biotech=5"
+
+/obj/item/organ/heart/cybernetic/emp_act()
+ Stop()
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index a1cdd40bfc4..eae5e8aee82 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -64,3 +64,25 @@
icon_state = "pliver"
desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen."
+/obj/item/organ/liver/cybernetic
+ name = "cybernetic liver"
+ icon_state = "liver-c"
+ desc = "An electronic device designed to mimic the functions of a human liver. It has no benefits over an organic liver, but is easy to produce."
+ origin_tech = "biotech=4"
+
+/obj/item/organ/liver/cybernetic/upgraded
+ name = "upgraded cybernetic liver"
+ icon_state = "liver-c-u"
+ desc = "An upgraded version of the cybernetic liver, designed to improve upon organic livers. It is resistant to alcohol poisoning and is very robust at filtering toxins."
+ origin_tech = "biotech=6"
+ alcohol_tolerance = 0.001
+ maxHealth = 200 //double the health of a normal liver
+ toxTolerance = 15 //can shrug off up to 15u of toxins
+ toxLethality = 0.3 //20% less damage than a normal liver
+
+/obj/item/organ/liver/cybernetic/emp_act(severity)
+ switch(severity)
+ if(1)
+ damage+=100
+ if(2)
+ damage+=50
diff --git a/code/modules/tgui/subsystem.dm b/code/modules/tgui/subsystem.dm
index c82936bf5dd..c44c91c92bd 100644
--- a/code/modules/tgui/subsystem.dm
+++ b/code/modules/tgui/subsystem.dm
@@ -225,7 +225,7 @@
/**
* private
*
- * Handle clients switching mobs, by transfering their UIs.
+ * Handle clients switching mobs, by transferring their UIs.
*
* required user source The client's original mob.
* required user target The client's new mob.
diff --git a/code/modules/vehicles/bicycle.dm b/code/modules/vehicles/bicycle.dm
index d51de5809c5..2d9b3c82584 100644
--- a/code/modules/vehicles/bicycle.dm
+++ b/code/modules/vehicles/bicycle.dm
@@ -13,12 +13,12 @@
/obj/vehicle/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1)
if(prob(easter_egg_chance) || (SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
- M << sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = 42)
+ M << sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = CHANNEL_BICYCLE)
. = ..()
/obj/vehicle/bicycle/unbuckle_mob(mob/living/buckled_mob,force = 0)
if(buckled_mob)
- buckled_mob << sound(null, repeat = 0, wait = 0, volume = 80, channel = 42)
+ buckled_mob.stop_sound_channel(CHANNEL_BICYCLE)
. =..()
/obj/vehicle/bicycle/tesla_act() // :::^^^)))
diff --git a/code/world.dm b/code/world.dm
index 404f982adb8..1fe2b5f25d6 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -5,10 +5,8 @@
view = "15x15"
cache_lifespan = 7
hub = "Exadv1.spacestation13"
- hub_password = "kMZy3U5jJHSiBQjr"
name = "/tg/ Station 13"
fps = 20
- visibility = 0
#ifdef GC_FAILURE_HARD_LOOKUP
loop_checks = FALSE
#endif
@@ -61,16 +59,16 @@
if(config.sql_enabled)
if(SSdbcore.Connect())
log_world("Database connection established.")
- var/datum/DBQuery/db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_version")]")
- db_version.Execute()
- if(db_version.NextRow())
- var/db_major = db_version.item[1]
- var/db_minor = db_version.item[2]
+ var/datum/DBQuery/query_db_version = SSdbcore.NewQuery("SELECT major, minor FROM [format_table_name("schema_version")] ORDER BY date DESC LIMIT 1")
+ query_db_version.Execute()
+ if(query_db_version.NextRow())
+ var/db_major = query_db_version.item[1]
+ var/db_minor = query_db_version.item[2]
if(db_major < DB_MAJOR_VERSION || db_minor < DB_MINOR_VERSION)
- message_admins("db schema ([db_major].[db_minor]) is behind latest tg schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
- log_sql("db schema ([db_major].[db_minor]) is behind latest tg schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
+ message_admins("Database schema ([db_major].[db_minor]) is behind latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
+ log_sql("Database schema ([db_major].[db_minor]) is behind latest schema version ([DB_MAJOR_VERSION].[DB_MINOR_VERSION]), this may lead to undefined behaviour or errors")
else
- message_admins("Could not get schema version from db")
+ message_admins("Could not get schema version from database")
else
log_world("Your server failed to establish a connection with the database.")
@@ -107,10 +105,10 @@
/world/Topic(T, addr, master, key)
var/list/input = params2list(T)
-
+
var/pinging = ("ping" in input)
var/playing = ("players" in input)
-
+
if(!pinging && !playing && config && config.log_world_topic)
GLOB.world_game_log << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]"
@@ -304,3 +302,12 @@
s += ": [jointext(features, ", ")]"
status = s
+
+/world/proc/update_hub_visibility(new_visibility)
+ if(new_visibility == GLOB.hub_visibility)
+ return
+ GLOB.hub_visibility = new_visibility
+ if(GLOB.hub_visibility)
+ hub_password = "kMZy3U5jJHSiBQjr"
+ else
+ hub_password = "SORRYNOPASSWORD"
diff --git a/html/changelog.html b/html/changelog.html
index b44d458f239..615914d99e5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,88 @@
-->
+
27 July 2017
+
Anonmare updated:
+
+ - Informs a person about how bomb cores work
+
+
BeeSting12 updated:
+
+ - Water bottles from the sustenance vendor are gone. Wait for the ice in the ice cups melt, criminal scum.
+ - There is no longer a sink in gulag. Hygiene is for the moral members of society.
+ - Janitor and service cyborgs now get pocket fire extinguishers for fire suppression and space propulsion.
+ - Pubbystation's dorms now has a dresser.
+ - Crafting satchels from leather now makes a leather satchel rather than a regular satchel.
+
+
Fox McCloud updated:
+
+ - breathing plasma now causes direct tox damage
+ - breathing hot/cold air now warns you when you're doing so, again
+ - species heat/cold mod now impacts damage from breathing hot/cold gases
+
+
HAL 9000 updated:
+
+ - I'm sorry Dave, I'm afraid I can't do that
+
+
JStheguy updated:
+
+ - Resprited the tablet, including completely redone screen sprites.
+ - Tablets can now come spawn in one of 5 colors; red, green, yellow, blue, and black.
+ - Most alcohol bottles have been resprited, as well as a poster that used one of the current bottles as part of it's design.
+
+
Joan updated:
+
+ - Unwrenching clockwork structures no longer damages them.
+ - The Hierophant will now release a burst when melee attacking instead of actually hitting its target.
+ - The Hierophant Club's blasts will now properly aggro hostile mobs.
+ - The blood-drunk miner will fire its KA a bit more often.
+
+
PopNotes updated:
+
+ - Nar-Sie now sounds like an eldritch abomination that obliterates worlds instead of a sweet maiden that gently whispers sweet nothings in your ear.
+
+
Supermichael777 updated:
+
+ - delayed chloral hydrate actually works now.
+
+
Tacolizard updated:
+
+ - Added cybernetic organs to RnD, they can be used to replace organic organs. Remember to administer corazone during implantation though!
+ - Added the upgraded cybernetic liver. It is exceptionally robust against toxins and alcohol poisoning.
+
+
Xhuis updated:
+
+ - Cyborgs now regenerate oxygen damage.
+ - If a cyborg somehow takes toxin damage, it can be healed with cables as though it was burn damage.
+ - Picking up ores by walking over them now longer spams messages, instead showing one message per tile of ore picked up.
+ - You can now control-click action buttons to lock them and prevent them from being moved. Alt-clicking the "Show/Hide Actions" button will unlock all buttons.
+ - There is now a preference for if buttons should be locked by default or not.
+ - Pizza box stacks can now fall over
+ - Pizza box inhands now stacks depending on how many you're holding.
+ - Mining satchels no longer hold infinite amounts of ore.
+ - Reviving Stasis now consistently regenerates organs.
+ - Medibots now properly render the overlays of the medkits they are made from.
+ - The latest batch of Syndicate screwdrivers fell into a vat of paint and were colored randomly. We have rinsed them off and they will no longer come in random colors.
+ - Supermatter slivers can now be stolen properly.
+ - Whenever you're trying to hack off your own limbs, you'll now always hit those limbs.
+
+
Xhuis & MoreRobustThanYou updated:
+
+ - Toolbelts now have overlays for crowbars, wirecutters, screwdrivers, multitools, and wrenches.
+
+
Y0SH1_M4S73R updated:
+
+ - Romerol zombies count as dead for assassinate and maroon objectives.
+
+
bandit updated:
+
+ - New Cards against Spess cards are available!
+
+
ktccd updated:
+
+ - Hijacking should now be possible again!
+
+
18 July 2017
BeeSting12 updated:
@@ -996,239 +1078,6 @@
- You can now add bayonets to kinetic accelerators. However, only combat knives and survival knives can be added. Harm intent attacking things will cause you to attack that thing with the bayonet instead!
-
- 25 May 2017
- 4dplanner updated:
-
- - crushers now apply marks properly
- - 20% of internal affairs agents are actually traitors
-
- 4dplanner, robustin updated:
-
- - c4 has always taken 3 seconds to plant, and you are not allow to believe otherwise
-
- Crexfu updated:
-
- - typo fix for origin tech
-
- Cyberboss updated:
-
- - Explosions will no longer have a start up delay
- - Indestructible objects can no longer be destroyed by bombs
-
- Oldman Robustin updated:
-
- - Gang mode now calls a 4 minute unrecallable shuttle once 60% of the crew is dead
-
- ohnopigeons updated:
-
- - The cost of plasma has been reduced from 500 to 300, but retain their immunity to saturation
-
-
- 24 May 2017
- Joan, WJohnston updated:
-
- - Adds marker beacons to mining as a vendible item. They can be bought in stacks of 1, 10, and 30 at a rate of 10 points per beacon.
- - Miners start with a stack of 10 in their backpack, and the Extraction and Rescue Kit contains a stack of 30.
- - Marker beacons come in a large selection of colors and simply light up a small area when placed, but are useful as a path marker or to indicate dangers.
-
- QualityVan updated:
-
- - Hairless hides now become wet when exposed to water
- - You can microwave wet leather to dry it
- - Inserted legion cores no longer work if they went inert before implanting
-
- Steelpoint updated:
-
- - Sketchin alternative magazines (Armour Piercing, Hollow Point, Incendiary) now have unique sprites to better identify them.
- - ERT Sec Tactical Energy Guns now have a unique sprite.
- - Changes to production of Nanotrasen Auto Rifle armour piercing bullets have now made AP bullets better able to penetrate armour, but at the cost of the amount of possible damage the bullet can do to soft targets.
- - Many Ballistic weapons now have new sounds related to reloading or placing bullets into magazines.
- - Boxstation armoury weapon racks now have glass panes to help prevent the weapons easily flying out of a breached hull.
- - Fixed Battleship Raven's bridge blast doors not working.
-
- Tacolizard updated:
-
- - Station based armour is slightly more descriptive of what it does.
-
- That Really Good Soda Flavor updated:
-
- - Changed spray tan overdoses to be more realistic.
- - People who are high and beach bums can now talk in their own stoner language.
- - Beach bums can only communicate with other beach bums and people who are high.
-
-
- 23 May 2017
- ClosingBracket updated:
-
- - Fixed very minor inconsistencies on items & punctuation on items.
-
- Joan updated:
-
- - Nanotrasen has taken a lower bid for their meson suppliers, and meson scanners will no longer display terrain layouts while on the planet.
- - However, they have discovered that, with some tweaks, mineral scanners will no longer actually require you to be wearing mesons.
- - The cheaper mesons will not completely remove reliance on light.
- - Ripleys will collect all ore in front of them when they move with a clamp and stored ore box.
- - Chasms will glow dimly, like lava.
-
- Joan, Repukan updated:
-
- - Traitor miners can now buy up to 2 KA Pressure Mods for 5 TC each.
- - KA Pressure Mods now only take up 35 mod capacity each, allowing traitor miners to use 2 and have space for 1 other mod.
- - R&D can no longer build KA Pressure Mods.
-
- Robustin updated:
-
- - Added a sexy new icon for the harvester's AOE conversion spell
- - Fixed construct's forcewall being invisible
- - Fixed cult constructs "Locate Master" and "Locate Prey" not functioning
- - Fixed spell action buttons not showing their actual availability status
- - Changed the duration of a few frames for the new Cult ending
-
- Steelpoint updated:
-
- - Auto Rifle alt ammo mags (AP, Incendiary, Uranium Tipped) now have a coloured stripe to denote them.
-
- That Really Good Soda Flavor updated:
-
- - Martial arts are no longer lost when mind-swapping, cloning, moving your brain, et cetera.
- - Fixed a bug where paper bins could swallow up pens into the void.
-
- coiax updated:
-
- - Galactic Common has been added to silicon's internal language database, meaning even if a cyborg is created from someone who previously did not know Galactic Common, they will be able to speak it as a silicon.
-
- kevinz000 updated:
-
- - Spessmen seems to have stopped suffering from the mental condition that makes them believe they can't move fast if they have only one leg, even if they're in space and using a jetpack!
-
- ma44 updated:
-
- - Reports of syndicate base on lavaland has been outfitted with a state of the art donksoft toy weapon dispenser.
-
-
- 22 May 2017
- Joan updated:
-
- - Resonator fields now visually show how long they have until they burst.
- - Hitting a legion skull with a resonator will now produce a field.
- - Swapped how far plasma cutter blasts go when going through rock and in open air. This means blasts through air will go 4/5 tiles, but will mine 7/10 tiles, for normal/advanced plasma cutters, respectively.
- - There is now a buffer zone between the mining base and lavaland where megafauna will not spawn.
- - Ruins will no longer spawn directly in front of the mining base.
-
- Lzimann updated:
-
- - Pandemic is now tgui!
-
- Robustin updated:
-
- - Gang influence is now decentralized, each gangster has their own influence that they can increase by spraying (and protecting) their tags and new influence-enhancing bling.
- - Gang uniforms are now created based on your gang's color and can be purchased by any gang member. They will increase the wearer's influence and provide protection, but will make it fairly obvious which gang you belong to.
- - Gangs have access to a new surplus rifle; it is a semi-automatic rifle that is very bulky and has a very low rate of fire. Gang members can buy this gun for just 8 influence.
- - Gangs have access to the new machine gun turret; it unleashes a volley of bullets with an extended view range. It does not run out of ammo, but a significant delay between volleys and its stationary nature leaves the gunner vulnerable to flanking and return fire. Holding down the trigger will allow you to aim the gun while firing. It will cost gangs 50 influence.
- - The sawn-off improvised shotgun is now available to gangs for 6 influence. With buckshot shells being easy to produce or purchase, this gun gives the most "bang for your buck" but its single-shell capacity will leave you vulnerable during a pitched gunfight.
- - The Wetwork boots give gangs access to a lightly armored noslip variant.
- - The armored gang outfits are now slightly more resistant to ballistic and bomb damage
-
- Swindly updated:
-
- - Monkeys can be weakened by stamina loss
-
- kevinz000 updated:
-
- - Nanotrasen decided to remove the integrated jet engines from jetpacks. They can no longer be used successfully indoors.
-
-
- 21 May 2017
- Gun Hog updated:
-
- - The Auxiliary Base can no longer land outside the lavaland map's boundaries.
-
- RandomMarine updated:
-
- - Drone laws no longer restrict drones to the station.
-
- Steelpoint updated:
-
- - The Warden's Cycler Shotgun has been replaced with a Compact Combat Shotgun. A unique weapon, it can fit in armour slots but at the sacrifice of a smaller ammo capacity of four shells.
-
-
- 20 May 2017
- Joan updated:
-
- - Proto-kinetic crushers have been worked over by our highly qualified techs, will recharge 12% faster, and no longer require very low-pressure atmospheres to fire!
- - In addition, our techs have tweaked the quantum linker module and proto-kinetic crushers can apply multiple marks to different targets! Marks applied may eventually expire if not detonated.
-
- Steelpoint updated:
-
- - All Pulse weapons now accurately show, by their sprites, what fire mode they are in.
- - ERT, non-red alert, Security Response Officers spawn with a Tactical Energy Gun. This is a military variant of the Egun that, in addition to laser and disable rounds, has access to stun rounds.
- - Pulse Pistols can now be recharged.
-
- Swindly updated:
-
- - Added modified syringe guns. They fire DNA injectors. Geneticists and CMOs can buy them from the traitor uplink for 14 TC.
-
- coiax updated:
-
- - When a shuttle is called, sometimes an on-call admiral, using available information to them, will recall the shuttle from Centcom.
-
- octareenroon91 updated:
-
- - Golems touching a shell can now choose to stay in their own body.
-
-
- 19 May 2017
- 4dplanner updated:
-
- - the Hierophant club has gained in power
-
-
- 18 May 2017
- Joan updated:
-
- - Proselytizing alloy shards will now proselytize all the shards in the tile, instead of requiring you to proselytize each one at a time.
-
- Lordpidey updated:
-
- - Space ninjas now use action buttons instead of verbs for a more consistent user experience.
- - Toy toolboxes with realistic rumbling action have been added to arcade prizes.
-
- Tacolizard Forever: Plasmaman Powercreep updated:
-
- - Plasmaman tanks are the same size as emergency oxygen tanks.
-
- coiax updated:
-
- - Syndicate agents can purchase a "codespeak manual", that teaches them a language that sounds like a series of codewords. You can also hit other people with the manual to teach them. One use per manual.
- - Nuclear operatives have access to a deluxe manual that is more expensive but has unlimited uses.
- - Syndicate AIs know Codespeak for free.
- - Spacevines can no longer spread on space transit turfs.
- - Plastic explosives can no longer be detonated by EMPs.
- - Various vending machines, when shooting their inventory at nearby people, will "demonstrate their products features". This means that if a cigarette vending machine throws a lighter at you, it will be on. Vending machines also choose random products when throwing, rather than the first available one.
-
- kevinz000 updated:
-
- - Peacekeeper cyborgs now have projectile dampening fields.
-
-
- 17 May 2017
- 4dplanner updated:
-
- - revenant respawning will not spam up deadchat so much, and is less likely to break.
-
- Expletive updated:
-
- - Syndicate Tomes have been added to traitor uplinks for 9 TC. They let an agent or an operative provide both weal and woe.
-
- Penguaro updated:
-
- - Centcom Engineering has reviewed the power schematic for the engine room and added an Area Power Controller.
-
- coiax updated:
-
- - Magic eightballs are now tiny items, able to fit into a box and pocket.
-
{{fileinfo}}
@@ -86,5 +86,5 @@
{{/if}}
{{/if}}
{{/if}}
-
NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559
+
NTOS v2.0.4b Copyright Nanotrasen 2557 - 2559
\ No newline at end of file
diff --git a/tools/readme.txt b/tools/UnstandardnessTestForDM/readme.txt
similarity index 100%
rename from tools/readme.txt
rename to tools/UnstandardnessTestForDM/readme.txt
diff --git a/tools/check_filedirs.sh b/tools/check_filedirs.sh
deleted file mode 100755
index 30df015763e..00000000000
--- a/tools/check_filedirs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-if [ -n "$1" ]
-then
- dme=$1
-else
- echo "Specify a DME to check"
- exit 1
-fi
-
-if [[ $(awk '/BEGIN_FILE_DIR/{flag=1;next}/END_FILE_DIR/{flag=0}flag' $dme | wc -l) -ne 1 ]]
-then
- echo "File DIR was ticked, please untick it, see: https://tgstation13.org/phpBB/viewtopic.php?f=5&t=321 for more"
- exit 1
-fi
-