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

Merge Conflict Resolved

Browse Source
This commit is contained in:
MINIMAN10000
2018-04-17 11:24:50 -07:00
parent f023edefa7 e2437c148f
commit ad53317db1
48 changed files with 648 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/signaler.dm
+2 -1
View File
@@ -29,7 +29,8 @@
/obj/item/device/assembly/signaler/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
radio_controller.remove_object(src, frequency)
radio_connection = null
return ..()
/obj/item/device/assembly/signaler/describe()
code/modules/clothing/spacesuits/void.dm
+106 -7
View File
@@ -1,14 +1,113 @@
//NASA Voidsuit
//Voidsuits
/obj/item/clothing/head/helmet/space/nasavoid
name = "NASA Void Helmet"
desc = "A high tech, NASA Centcom branch designed, dark red space suit helmet. Used for AI satellite maintenance."
icon_state = "void"
desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance."
icon_state = "void-red"
item_state = "void"
flags_inv = HIDEMASK|HIDEEARS
/obj/item/clothing/suit/space/nasavoid
name = "NASA Voidsuit"
icon_state = "void"
name = "NASA Void Suit"
icon_state = "void-red"
item_state = "void"
desc = "A high tech, NASA Centcom branch designed, dark red Space suit. Used for AI satellite maintenance."
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool)
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance."
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool)
//Colors!!!
/obj/item/clothing/head/helmet/space/nasavoid/green
icon_state = "void-green"
/obj/item/clothing/suit/space/nasavoid/green
icon_state = "void-green"
/obj/item/clothing/head/helmet/space/nasavoid/ntblue
icon_state = "void-ntblue"
/obj/item/clothing/suit/space/nasavoid/ntblue
icon_state = "void-ntblue"
/obj/item/clothing/head/helmet/space/nasavoid/purple
icon_state = "void-purple"
/obj/item/clothing/suit/space/nasavoid/purple
icon_state = "void-purple"
/obj/item/clothing/head/helmet/space/nasavoid/yellow
icon_state = "void-yellow"
/obj/item/clothing/suit/space/nasavoid/yellow
icon_state = "void-yellow"
/obj/item/clothing/head/helmet/space/nasavoid/ltblue
icon_state = "void-light_blue"
/obj/item/clothing/suit/space/nasavoid/ltblue
icon_state = "void-light_blue"
//Captian's Suit, like the other captian's suit, but looks better, at the cost of armor
/obj/item/clothing/head/helmet/space/nasavoid/captain
name = "Fancy Retro Void Helmet"
icon_state = "void-captian"
desc = "A high tech, NASA Centcom branch designed space suit helmet. Used for AI satellite maintenance. This one is fit for a captain."
/obj/item/clothing/suit/space/nasavoid/captain
name = "Fancy NASA Void Suit"
icon_state = "void-captian"
desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance. This one is fit for a captain."
//Syndi's suit, on par with a blood red softsuit
/obj/item/clothing/head/helmet/space/nasavoid/syndi
name = "Blood Red Retro Void Helmet"
icon_state = "void-syndi"
desc = "A high tech, NASA Centcom branch designed space suit helmet. This one looks rather suspicious."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/nasavoid/syndi
name = "Blood Red NASA Void Suit"
icon_state = "void-syndi"
desc = "A high tech, NASA Centcom branch designed space suit. This one looks rather suspicious."
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
//random spawner
/obj/effect/nasavoidsuitspawner
name = "NASA Void Suit Spawner"
icon = 'icons/obj/clothing/suits.dmi'
icon_state = "void-red"
desc = "You shouldn't see this, a spawner for NASA Void Suits."
var/suits = list("red", "green", "ntblue", "purple", "yellow", "ltblue")
/obj/effect/nasavoidsuitspawner/New()
var/obj/item/clothing/head/helmet/space/nasavoid/H
var/obj/item/clothing/suit/space/nasavoid/S
switch(pick(suits))
if("red")
H = new /obj/item/clothing/head/helmet/space/nasavoid
S = new /obj/item/clothing/suit/space/nasavoid
if("green")
H = new /obj/item/clothing/head/helmet/space/nasavoid/green
S = new /obj/item/clothing/suit/space/nasavoid/green
if("ntblue")
H = new /obj/item/clothing/head/helmet/space/nasavoid/ntblue
S = new /obj/item/clothing/suit/space/nasavoid/ntblue
if("purple")
H = new /obj/item/clothing/head/helmet/space/nasavoid/purple
S = new /obj/item/clothing/suit/space/nasavoid/purple
if("yellow")
H = new /obj/item/clothing/head/helmet/space/nasavoid/yellow
S = new /obj/item/clothing/suit/space/nasavoid/yellow
if("ltblue")
H = new /obj/item/clothing/head/helmet/space/nasavoid/ltblue
S = new /obj/item/clothing/suit/space/nasavoid/ltblue
var/turf/T = get_turf(src)
if(H)
H.forceMove(T)
if(S)
S.forceMove(T)
qdel(src)
code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+1
View File
@@ -32,6 +32,7 @@
********************/
/obj/machinery/kitchen_machine/New()
..()
create_reagents(100)
reagents.set_reacting(FALSE)
if(!available_recipes)
code/modules/logic/logic_base.dm
+2 -1
View File
@@ -62,7 +62,8 @@
/obj/machinery/logic_gate/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
radio_controller.remove_object(src, frequency)
radio_connection = null
return ..()
/obj/machinery/logic_gate/process()
code/modules/pda/radio.dm
+1
View File
@@ -168,6 +168,7 @@
/obj/item/radio/integrated/signal/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
radio_connection = null
return ..()
/obj/item/radio/integrated/signal/initialize()
code/modules/power/cable.dm
+3 -17
View File
@@ -599,35 +599,21 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
..()
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
// Cable merging is handled by parent proc
if(C.amount >= MAXCOIL)
to_chat(user, "The coil is too long, you cannot add any more cable to it.")
to_chat(user, "The coil is as long as it will get.")
return
if( (C.amount + src.amount <= MAXCOIL) )
to_chat(user, "You join the cable coils together.")
C.give(src.amount) // give it cable
src.use(src.amount) // make sure this one cleans up right
return
else
var/amt = MAXCOIL - C.amount
to_chat(user, "You transfer [amt] length\s of cable from one coil to the other.")
C.give(amt)
src.use(amt)
to_chat(user, "You transfer [get_amount_transferred()] length\s of cable from one coil to the other.")
return
if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
cable_color(C.colourName)
//add cables to the stack
/obj/item/stack/cable_coil/proc/give(var/extra)
if(amount + extra > MAXCOIL)
amount = MAXCOIL
else
amount += extra
update_icon()
///////////////////////////////////////////////
// Cable laying procedures
//////////////////////////////////////////////
code/modules/power/singularity/emitter.dm
+3
View File
@@ -117,6 +117,9 @@
update_icon()
/obj/machinery/power/emitter/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
radio_connection = null
msg_admin_attack("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("<font color='red'>deleted</font> at ([x],[y],[z])","singulo")