cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic

Browse Source
This commit is contained in:
FalseIncarnate
2016-04-05 19:15:11 -04:00
parent 5fb1946201 c7125a4070
commit 40ee9bb99d
434 changed files with 16507 additions and 12215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
+24
View File
@@ -251,6 +251,14 @@
build_path = /obj/item/device/assembly/voice
category = list("initial", "Miscellaneous")
/datum/design/videocam
name = "Video Camera"
id = "videocam"
build_type = AUTOLATHE
materials = list(MAT_METAL = 120, MAT_GLASS = 60)
build_path = /obj/item/device/videocam
category = list("initial", "Miscellaneous")
/datum/design/canvas
name = "11px by 11px Canvas"
id = "canvas"
@@ -439,6 +447,22 @@
build_path = /obj/item/weapon/bonesetter
category = list("initial", "Medical")
/datum/design/fixovein
name = "FixOVein"
id = "fixovein"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 3000)
build_path = /obj/item/weapon/FixOVein
category = list("initial", "Medical")
/datum/design/bonegel
name = "Bone Gel"
id = "bonegel"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 6000)
build_path = /obj/item/weapon/bonegel
category = list("initial", "Medical")
/datum/design/syringe
name = "Syringe"
id = "syringe"
code/modules/research/designs/comp_board_designs.dm
+10
View File
@@ -182,6 +182,16 @@
build_path = /obj/item/weapon/circuitboard/operating
category = list("Computer Boards")
/datum/design/pandemic
name = "Computer Design (PanD.E.M.I.C. 2200)"
desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
id = "pandemic"
req_tech = list("programming" = 2, "biotech" = 2)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pandemic
category = list("Computer Boards")
/datum/design/powermonitor
name = "Console Board (Power Monitor)"
desc = "Allows for the construction of circuit boards used to build a new power monitor"
code/modules/research/rdconsole.dm
+11
View File
@@ -246,6 +246,17 @@ proc/CallMaterialName(ID)
else if(href_list["copy_design"]) //Copy design data from the research holder to the design disk.
for(var/datum/design/D in files.known_designs)
if(href_list["copy_design_ID"] == D.id)
var/autolathe_friendly = 1
for(var/x in D.materials)
if( !(x in list(MAT_METAL, MAT_GLASS)))
autolathe_friendly = 0
D.category -= "Imported"
if(D.locked)
autolathe_friendly = 0
D.category -= "Imported"
if(D.build_type & (AUTOLATHE|PROTOLATHE|CRAFTLATHE)) // Specifically excludes circuit imprinter and mechfab
D.build_type = autolathe_friendly ? (D.build_type | AUTOLATHE) : D.build_type
D.category |= "Imported"
d_disk.blueprint = D
break
screen = 1.4
code/modules/research/xenobiology/xenobio_camera.dm
+171
View File
@@ -0,0 +1,171 @@
//Xenobio control console
/mob/camera/aiEye/remote/xenobio
visible_icon = 1
icon = 'icons/obj/abductor.dmi'
icon_state = "camera_target"
/mob/camera/aiEye/remote/xenobio/setLoc(var/t)
var/area/new_area = get_area(t)
if(new_area && new_area.name == "Xenobiology Lab" || istype(new_area, /area/toxins/xenobiology ))
return ..()
else
return
/obj/machinery/computer/camera_advanced/xenobio
name = "Slime management console"
desc = "A computer used for remotely handling slimes."
networks = list("SS13")
off_action = new/datum/action/camera_off/xenobio
var/datum/action/slime_place/slime_place_action = new
var/datum/action/slime_pick_up/slime_up_action = new
var/datum/action/feed_slime/feed_slime_action = new
var/datum/action/monkey_recycle/monkey_recycle_action = new
var/list/stored_slimes = list()
var/max_slimes = 5
var/monkeys = 0
icon_screen = "slime_comp"
icon_keyboard = "rd_key"
/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
eyeobj = new /mob/camera/aiEye/remote/xenobio()
eyeobj.loc = get_turf(src)
eyeobj.origin = src
eyeobj.visible_icon = 1
eyeobj.icon = 'icons/obj/abductor.dmi'
eyeobj.icon_state = "camera_target"
/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/carbon/user)
off_action.target = user
off_action.Grant(user)
jump_action.target = user
jump_action.Grant(user)
slime_up_action.target = src
slime_up_action.Grant(user)
slime_place_action.target = src
slime_place_action.Grant(user)
feed_slime_action.target = src
feed_slime_action.Grant(user)
monkey_recycle_action.target = src
monkey_recycle_action.Grant(user)
/obj/machinery/computer/camera_advanced/xenobio/attack_hand(mob/user)
if(!ishuman(user)) //AIs using it might be weird
return
return ..()
/datum/action/camera_off/xenobio/Activate()
if(!target || !ishuman(target))
return
var/mob/living/carbon/C = target
var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/origin = remote_eye.origin
C.remote_view = 0
origin.current_user = null
origin.jump_action.Remove(C)
origin.slime_place_action.Remove(C)
origin.slime_up_action.Remove(C)
origin.feed_slime_action.Remove(C)
origin.monkey_recycle_action.Remove(C)
//All of this stuff below could probably be a proc for all advanced cameras, only the action removal needs to be camera specific
remote_eye.user = null
if(C.client)
C.client.perspective = MOB_PERSPECTIVE
C.client.eye = src
C.client.images -= remote_eye.user_image
for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
C.client.images -= chunk.obscured
C.remote_control = null
C.unset_machine()
src.Remove(C)
/datum/action/slime_place
name = "Place Slimes"
action_type = AB_INNATE
button_icon_state = "slime_down"
/datum/action/slime_place/Activate()
if(!target || !ishuman(owner))
return
var/mob/living/carbon/human/C = owner
var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = target
if(cameranet.checkTurfVis(remote_eye.loc))
for(var/mob/living/carbon/slime/S in X.stored_slimes)
S.forceMove(remote_eye.loc)
S.visible_message("[S] warps in!")
X.stored_slimes -= S
/datum/action/slime_pick_up
name = "Pick up Slime"
action_type = AB_INNATE
button_icon_state = "slime_up"
/datum/action/slime_pick_up/Activate()
if(!target || !ishuman(owner))
return
var/mob/living/carbon/human/C = owner
var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = target
if(cameranet.checkTurfVis(remote_eye.loc))
for(var/mob/living/carbon/slime/S in remote_eye.loc)
if(X.stored_slimes.len >= X.max_slimes)
break
if(!S.ckey)
if(S.buckled)
S.buckled.unbuckle_mob()
S.Feedstop()
S.visible_message("[S] vanishes in a flash of light!")
S.forceMove(X)
X.stored_slimes += S
/datum/action/feed_slime
name = "Feed Slimes"
action_type = AB_INNATE
button_icon_state = "monkey_down"
/datum/action/feed_slime/Activate()
if(!target || !ishuman(owner))
return
var/mob/living/carbon/human/C = owner
var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = target
if(cameranet.checkTurfVis(remote_eye.loc))
if(X.monkeys >= 1)
var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(remote_eye.loc)
food.LAssailant = C
X.monkeys --
owner << "[X] now has [X.monkeys] monkeys left."
/datum/action/monkey_recycle
name = "Recycle Monkeys"
action_type = AB_INNATE
button_icon_state = "monkey_up"
/datum/action/monkey_recycle/Activate()
if(!target || !ishuman(owner))
return
var/mob/living/carbon/human/C = owner
var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = target
if(cameranet.checkTurfVis(remote_eye.loc))
for(var/mob/living/carbon/human/M in remote_eye.loc)
if(issmall(M) && M.stat)
M.visible_message("[M] vanishes as they are reclaimed for recycling!")
X.monkeys += 0.2
qdel(M)
code/modules/research/xenobiology/xenobiology.dm
+14 -3
View File
@@ -359,8 +359,7 @@
var/mob/living/M = A
if(M in immune)
continue
M.stunned += 10
M.canmove = 0
M.notransform = 1
M.anchored = 1
if(istype(M, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
@@ -388,7 +387,7 @@
return
/obj/effect/timestop/proc/unfreeze_mob(mob/living/M)
M.AdjustStunned(-10)
M.notransform = 0
M.anchored = 0
if(istype(M, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
@@ -439,6 +438,18 @@
max_amount = 60
turf_type = /turf/simulated/floor/sepia
/obj/item/areaeditor/blueprints/slime
name = "cerulean prints"
desc = "A one use set of blueprints made of jelly like organic material. Renaming an area to 'Xenobiology Lab' will extend the reach of the management console."
color = "#2956B2"
/obj/item/areaeditor/blueprints/slime/edit_area()
. = ..()
var/area/A = get_area(src)
if(.)
for(var/turf/T in A)
T.color = "#2956B2"
qdel(src)
/turf/simulated/floor/sepia
slowdown = 2