cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into just-defibrillator-things

Browse Source
This commit is contained in:
E-MonaRhg
2021-07-27 16:37:58 +02:00
parent f83b8ae14e 9131bb0623
commit 4ee75ce29d
612 changed files with 30944 additions and 45575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
+4 -29
View File
@@ -178,37 +178,12 @@
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/clothing/ears/earmuffs
category = list("initial", "Miscellaneous")
/datum/design/pipe_painter
name = "Pipe Painter"
id = "pipe_painter"
/datum/design/painter
name = "Modular Painter"
id = "mod_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
build_path = /obj/item/pipe_painter
category = list("initial", "Miscellaneous")
/datum/design/window_painter
name = "Window Painter"
id = "window_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 2000)
build_path = /obj/item/pipe_painter/window_painter
category = list("initial", "Miscellaneous")
/datum/design/floorpainter
name = "Floor painter"
id = "floor_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 125)
build_path = /obj/item/floor_painter
category = list("initial", "Miscellaneous")
/datum/design/airlock_painter
name = "Airlock painter"
id = "airlock_painter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 3000, MAT_GLASS = 1000)
build_path = /obj/item/airlock_painter
build_path = /obj/item/painter
category = list("initial", "Miscellaneous")
/datum/design/metal
code/modules/research/designs/weapon_designs.dm
+11
View File
@@ -269,3 +269,14 @@
locked = TRUE
access_requirement = list(ACCESS_RD)
category = list("Weapons")
/datum/design/bsg
name = "Blue Space Gun"
desc = "A heavy hitting energy cannon, that fires destructive bluespace blasts with a decent area of effect."
id = "bsg"
req_tech = list("combat" = 7, "materials" = 7, "magnets" = 7, "powerstorage" = 7, "bluespace" = 7)
build_type = PROTOLATHE
materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000) // Big gun, big cost
build_path = /obj/item/gun/energy/bsg
locked = TRUE
category = list("Weapons")
code/modules/research/xenobiology/xenobio_camera.dm
+4 -2
View File
@@ -4,6 +4,8 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "camera_target"
var/allowed_area = null
// The Xenobio Console does not trigger the AI Detector
ai_detector_visible = FALSE
/mob/camera/aiEye/remote/xenobio/New(loc)
var/area/A = get_area(loc)
@@ -233,8 +235,8 @@
var/obj/machinery/computer/camera_advanced/xenobio/X = target
if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
if(LAZYLEN(SSmobs.cubemonkeys) >= config.cubemonkeycap)
to_chat(owner, "<span class='warning'>Bluespace harmonics prevent the spawning of more than [config.cubemonkeycap] monkeys on the station at one time!</span>")
if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap)
to_chat(owner, "<span class='warning'>Bluespace harmonics prevent the spawning of more than [GLOB.configuration.general.monkey_cube_cap] monkeys on the station at one time!</span>")
return
else if(X.monkeys >= 1)
var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(remote_eye.loc)
code/modules/research/xenobiology/xenobiology.dm
+1 -1
View File
@@ -375,7 +375,7 @@
if(istype(O, /obj/vehicle))
var/obj/vehicle/V = O
var/vehicle_speed_mod = config.run_speed
var/vehicle_speed_mod = GLOB.configuration.movement.base_run_speed
if(V.vehicle_move_delay <= vehicle_speed_mod)
to_chat(user, "<span class='warning'>[V] can't be made any faster!</span>")
return ..()