cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 15:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner

Browse Source 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
This commit is contained in:
Markolie
2015-08-01 19:41:11 +02:00
parent 3afb9a75ad 10ceb14432
commit 2c1d0ea7d4
46 changed files with 591 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -2
View File
@@ -955,8 +955,8 @@ proc/move_gamma_ship()
toArea = locate(/area/shuttle/gamma/space)
fromArea.move_contents_to(toArea)
for(var/obj/machinery/mech_bay_recharge_port/P in toArea)
P.locate_recharge_turf()
for(var/turf/simulated/floor/mech_bay_recharge_floor/F in toArea)
F.init_devices()
for(var/obj/machinery/power/apc/A in toArea)
A.init()
code/modules/clothing/suits/miscellaneous.dm
+7
View File
@@ -365,6 +365,13 @@
_color = "mankini"
siemens_coefficient = 1
/obj/item/clothing/suit/jacket/miljacket
name = "military jacket"
desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
icon_state = "militaryjacket"
item_state = "militaryjacket"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/weapon/gun/projectile/revolver,/obj/item/weapon/gun/projectile/revolver/detective)
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
code/modules/food/recipes_candy.dm
+55 -60
View File
@@ -54,7 +54,7 @@
// Base Candy Recipes (unflavored / plain)
// ***********************************************************
/datum/recipe/candy/cotton
/datum/recipe/candy/cottoncandy
reagents = list("sugar" = 15)
items = list(
/obj/item/weapon/c_tube,
@@ -99,7 +99,7 @@
/obj/item/weapon/kitchen/mould/cane,
/obj/item/weapon/reagent_containers/food/snacks/mint,
)
result = /obj/item/weapon/reagent_containers/food/snacks/mint
result = /obj/item/weapon/reagent_containers/food/snacks/candy/candycane
byproduct = /obj/item/weapon/kitchen/mould/cane
/datum/recipe/candy/gum
@@ -115,7 +115,6 @@
result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar
/datum/recipe/candy/cash
reagents = list()
items = list(
/obj/item/weapon/kitchen/mould/cash,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
@@ -124,7 +123,6 @@
byproduct = /obj/item/weapon/kitchen/mould/cash
/datum/recipe/candy/coin
reagents = list()
items = list(
/obj/item/weapon/kitchen/mould/coin,
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
@@ -144,63 +142,63 @@
// Cotton Candy Recipes (flavored)
// ***********************************************************
/datum/recipe/candy/cotton/red
/datum/recipe/candy/cottoncandy_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/red
/datum/recipe/candy/cotton/blue
/datum/recipe/candy/cottoncandy_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue
/datum/recipe/candy/cotton/poison
/datum/recipe/candy/cottoncandy_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison
/datum/recipe/candy/cotton/green
/datum/recipe/candy/cottoncandy_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green
/datum/recipe/candy/cotton/yellow
/datum/recipe/candy/cottoncandy_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow
/datum/recipe/candy/cotton/orange
/datum/recipe/candy/cottoncandy_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange
/datum/recipe/candy/cotton/purple
/datum/recipe/candy/cottoncandy_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple
/datum/recipe/candy/cotton/pink
/datum/recipe/candy/cottoncandy_pink
reagents = list("watermelonjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink
/datum/recipe/candy/cotton/rainbow
/datum/recipe/candy/cottoncandy_rainbow
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/red,
@@ -213,7 +211,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow
/datum/recipe/candy/cotton/rainbow2
/datum/recipe/candy/cottoncandy_rainbow2
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/red,
@@ -230,67 +228,67 @@
// Gummy Bear Recipes (flavored)
// ***********************************************************
/datum/recipe/candy/gummybear/red
/datum/recipe/candy/gummybear_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/red
/datum/recipe/candy/gummybear/blue
/datum/recipe/candy/gummybear_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue
/datum/recipe/candy/gummybear/poison
/datum/recipe/candy/gummybear_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison
/datum/recipe/candy/gummybear/green
/datum/recipe/candy/gummybear_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green
/datum/recipe/candy/gummybear/yellow
/datum/recipe/candy/gummybear_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow
/datum/recipe/candy/gummybear/orange
/datum/recipe/candy/gummybear_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange
/datum/recipe/candy/gummybear/purple
/datum/recipe/candy/gummybear_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple
/datum/recipe/candy/gummybear/wtf
/datum/recipe/candy/gummybear_wtf
reagents = list("space_drugs" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf
/datum/recipe/candy/gummybear/wtf2
/datum/recipe/candy/gummybear_wtf2
reagents = list()
fruit = list("ambrosia" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf
@@ -298,67 +296,66 @@
// Gummy Worm Recipes (flavored)
// ***********************************************************
/datum/recipe/candy/gummyworm/red
/datum/recipe/candy/gummyworm_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/red
/datum/recipe/candy/gummyworm/blue
/datum/recipe/candy/gummyworm_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue
/datum/recipe/candy/gummyworm/poison
/datum/recipe/candy/gummyworm_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison
/datum/recipe/candy/gummyworm/green
/datum/recipe/candy/gummyworm_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green
/datum/recipe/candy/gummyworm/yellow
/datum/recipe/candy/gummyworm_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow
/datum/recipe/candy/gummyworm/orange
/datum/recipe/candy/gummyworm_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange
/datum/recipe/candy/gummyworm/purple
/datum/recipe/candy/gummyworm_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple
/datum/recipe/candy/gummyworm/wtf
/datum/recipe/candy/gummyworm_wtf
reagents = list("space_drugs" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf
/datum/recipe/candy/gummyworm/wtf2
reagents = list()
/datum/recipe/candy/gummyworm_wtf2
fruit = list("ambrosia" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf
@@ -366,56 +363,56 @@
// Jelly Bean Recipes (flavored)
// ***********************************************************
/datum/recipe/candy/jellybean/red
/datum/recipe/candy/jellybean_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/red
/datum/recipe/candy/jellybean/blue
/datum/recipe/candy/jellybean_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue
/datum/recipe/candy/jellybean/poison
/datum/recipe/candy/jellybean_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison
/datum/recipe/candy/jellybean/green
/datum/recipe/candy/jellybean_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green
/datum/recipe/candy/jellybean/yellow
/datum/recipe/candy/jellybean_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow
/datum/recipe/candy/jellybean/orange
/datum/recipe/candy/jellybean_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange
/datum/recipe/candy/jellybean/purple
/datum/recipe/candy/jellybean_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple
/datum/recipe/candy/jellybean/chocolate
/datum/recipe/candy/jellybean_chocolate
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
@@ -423,47 +420,45 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate
/datum/recipe/candy/jellybean/cola
/datum/recipe/candy/jellybean_cola
reagents = list("cola" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean/popcorn
/datum/recipe/candy/jellybean_popcorn
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/popcorn,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn
/datum/recipe/candy/jellybean/coffee
/datum/recipe/candy/jellybean_coffee
reagents = list("coffee" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean/drgibb
/datum/recipe/candy/jellybean_drgibb
reagents = list("dr_gibb" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean/wtf
/datum/recipe/candy/jellybean_wtf
reagents = list("space_drugs" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf
/datum/recipe/candy/jellybean/wtf2
reagents = list()
/datum/recipe/candy/jellybean_wtf2
fruit = list("ambrosia" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf
@@ -471,7 +466,7 @@
// Candybar Recipes (flavored)
// ***********************************************************
/datum/recipe/candy/candybar/caramel
/datum/recipe/candy/malper
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar,
@@ -479,7 +474,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel
/datum/recipe/candy/candybar/nougat
/datum/recipe/candy/toolerone
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar,
@@ -487,7 +482,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/nougat
/datum/recipe/candy/candybar/toffee
/datum/recipe/candy/yumbaton
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar,
@@ -495,14 +490,14 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/toffee
/datum/recipe/candy/candybar/rice
/datum/recipe/candy/crunch
reagents = list("rice" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar,
)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/rice
/datum/recipe/candy/candybar/caramel_nougat
/datum/recipe/candy/toxinstest
reagents = list()
items = list(
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar,
code/modules/mining/equipment_locker.dm
+1 -7
View File
@@ -10,13 +10,7 @@
anchored = 1.0
input_dir = NORTH
output_dir = SOUTH
req_one_access = list(
access_mining_station,
access_chemistry,
access_bar,
access_research,
access_ce
)
req_access = list(access_mineral_storeroom)
var/stk_types = list()
var/stk_amt = list()
var/stack_list[0] //Key: Type. Value: Instance of type.
code/modules/mob/living/silicon/robot/death.dm
+2 -2
View File
@@ -51,6 +51,7 @@
update_canmove()
if(camera)
camera.status = 0
update_headlamp(1) //So borg lights are disabled when killed.
if(in_contents_of(/obj/machinery/recharge_station))//exit the recharge station
var/obj/machinery/recharge_station/RC = loc
@@ -60,8 +61,7 @@
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
see_invisible = SEE_INVISIBLE_LEVEL_TWO
updateicon()
update_fire()
update_icons()
tod = worldtime2text() //weasellos time of death patch
if(mind) mind.store_memory("Time of death: [tod]", 0)
code/modules/mob/living/silicon/robot/drone/drone.dm
+2 -2
View File
@@ -66,7 +66,7 @@
//Some tidying-up.
flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'Nanotrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
updateicon()
update_icons()
/mob/living/silicon/robot/drone/init()
laws = new /datum/ai_laws/drone()
@@ -80,7 +80,7 @@
real_name = "maintenance drone ([rand(100,999)])"
name = real_name
/mob/living/silicon/robot/drone/updateicon()
/mob/living/silicon/robot/drone/update_icons()
overlays.Cut()
if(stat == 0)
code/modules/mob/living/silicon/robot/inventory.dm
+1 -5
View File
@@ -15,11 +15,7 @@
if(istype(O,/obj/item/borg/sight))
var/obj/item/borg/sight/S = O
sight_mode &= ~S.sight_mode
else if(istype(O, /obj/item/device/flashlight))
var/obj/item/device/flashlight/F = O
if(F.on)
F.on = 0
F.update_brightness(src)
if(client)
client.screen -= O
contents -= O
code/modules/mob/living/silicon/robot/life.dm
+8 -5
View File
@@ -42,7 +42,8 @@
if (is_component_functioning("power cell") && cell)
if(src.cell.charge <= 0)
uneq_all()
src.stat = 1
update_headlamp(1)
src.stat = UNCONSCIOUS
has_power = 0
for(var/V in components)
var/datum/robot_component/C = components[V]
@@ -63,6 +64,9 @@
for(var/V in components)
var/datum/robot_component/C = components[V]
C.consume_power()
var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
if(!is_component_functioning("actuator"))
Paralyse(3)
@@ -71,7 +75,8 @@
has_power = 1
else
uneq_all()
src.stat = 1
src.stat = UNCONSCIOUS
update_headlamp(1)
Paralyse(3)
/mob/living/silicon/robot/proc/handle_regular_status_updates()
@@ -324,7 +329,7 @@
src.module_state_2:screen_loc = ui_inv2
if(src.module_state_3)
src.module_state_3:screen_loc = ui_inv3
updateicon()
update_icons()
/mob/living/silicon/robot/proc/process_locks()
if(weapon_lock)
@@ -358,8 +363,6 @@
overlays -= image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing")
if(on_fire)
overlays += image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing")
update_icons()
return
/mob/living/silicon/robot/fire_act()
if(!on_fire) //Silicons don't gain stacks from hotspots, but hotspots can ignite them
code/modules/mob/living/silicon/robot/robot.dm
+52 -21
View File
@@ -22,6 +22,7 @@ var/list/robot_verbs_default = list(
var/obj/screen/inv1 = null
var/obj/screen/inv2 = null
var/obj/screen/inv3 = null
var/obj/screen/lamp_button = null
var/shown_robot_modules = 0 //Used to determine whether they have the module menu shown or not
var/obj/screen/robot_modules_background
@@ -74,6 +75,12 @@ var/list/robot_verbs_default = list(
var/braintype = "Cyborg"
var/base_icon = ""
var/crisis = 0
var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power.
var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
var/jetpackoverlay = 0
var/obj/item/borg/sight/hud/sec/sechud = null
var/obj/item/borg/sight/hud/med/healthhud = null
@@ -92,7 +99,8 @@ var/list/robot_verbs_default = list(
robot_modules_background.layer = 19 //Objects that appear on screen are on layer 20, UI should be just below it.
ident = rand(1, 999)
updatename("Default")
updateicon()
update_icons()
update_headlamp()
radio = new /obj/item/device/radio/borg(src)
common_radio = radio
@@ -364,7 +372,7 @@ var/list/robot_verbs_default = list(
custom_name = newname
updatename()
updateicon()
update_icons()
/mob/living/silicon/robot/verb/cmd_robot_alerts()
set category = "Robot Commands"
@@ -683,7 +691,7 @@ var/list/robot_verbs_default = list(
if(cell)
user << "You close the cover."
opened = 0
updateicon()
update_icons()
else if(wiresexposed && wires.IsAllCut())
//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
if(!mmi)
@@ -735,7 +743,7 @@ var/list/robot_verbs_default = list(
else
user << "You open the cover."
opened = 1
updateicon()
update_icons()
else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside
var/datum/robot_component/C = components["power cell"]
@@ -765,14 +773,14 @@ var/list/robot_verbs_default = list(
else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing
wiresexposed = !wiresexposed
user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
updateicon()
update_icons()
else if(istype(W, /obj/item/weapon/screwdriver) && opened && cell) // radio
if(radio)
radio.attackby(W,user)//Push it to the radio to let it handle everything
else
user << "Unable to locate a radio."
updateicon()
update_icons()
else if(istype(W, /obj/item/device/encryptionkey/) && opened)
if(radio)//sanityyyyyy
@@ -789,7 +797,7 @@ var/list/robot_verbs_default = list(
if(allowed(usr))
locked = !locked
user << "You [ locked ? "lock" : "unlock"] [src]'s interface."
updateicon()
update_icons()
else
user << "\red Access denied."
@@ -871,7 +879,7 @@ var/list/robot_verbs_default = list(
if(src.module && istype(src.module, /obj/item/weapon/robot_module/medical))
for(var/obj/item/weapon/borg_defib/F in src.module.modules)
F.safety = 0
updateicon()
update_icons()
return
/mob/living/silicon/robot/verb/unlock_own_cover()
@@ -882,7 +890,7 @@ var/list/robot_verbs_default = list(
switch(alert("You can not lock your cover again, are you sure?\n (You can still ask for a human to lock it)", "Unlock Own Cover", "Yes", "No"))
if("Yes")
locked = 0
updateicon()
update_icons()
usr << "You unlock your cover."
/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
@@ -991,7 +999,7 @@ var/list/robot_verbs_default = list(
user.put_in_active_hand(cell)
user << "You remove \the [cell]."
cell = null
updateicon()
update_icons()
if(!opened && (!istype(user, /mob/living/silicon)))
if (user.a_intent == "help")
@@ -1023,12 +1031,10 @@ var/list/robot_verbs_default = list(
return 1
return 0
/mob/living/silicon/robot/proc/updateicon()
/mob/living/silicon/robot/update_icons()
overlays.Cut()
if(stat == 0)
overlays += "eyes"
overlays.Cut()
if(stat != DEAD && !(paralysis || stunned || weakened)) //Not dead, not stunned.
overlays += "eyes-[icon_state]"
else
overlays -= "eyes"
@@ -1059,16 +1065,16 @@ var/list/robot_verbs_default = list(
icon_state = "[base_icon]-roll"
else
icon_state = base_icon
return
/mob/living/silicon/robot/proc/updatefire()
return
if(jetpackoverlay)
overlays += "minerjetpack-[icon_state]"
update_fire()
//Call when target overlay should be added/removed
/mob/living/silicon/robot/update_targeted()
if(!targeted_by && target_locked)
qdel(target_locked)
updateicon()
update_icons()
if (targeted_by && target_locked)
overlays += target_locked
@@ -1189,6 +1195,32 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/proc/radio_menu()
radio.interact(src)//Just use the radio's Topic() instead of bullshit special-snowflake code
/mob/living/silicon/robot/proc/control_headlamp()
if(stat || lamp_recharging)
src << "<span class='danger'>This function is currently offline.</span>"
return
//Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0.
lamp_intensity = (lamp_intensity+2) % (lamp_max+2)
src << "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]"
update_headlamp()
/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100)
set_light(0)
if(lamp_intensity && (turn_off || stat))
src << "<span class='danger'>Your headlamp has been deactivated.</span>"
lamp_intensity = 0
lamp_recharging = 1
spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
lamp_recharging = 0
else
set_light(light_range + lamp_intensity)
if(lamp_button)
lamp_button.icon_state = "lamp[lamp_intensity]"
update_icons()
/mob/living/silicon/robot/Move(a, b, flag)
@@ -1309,8 +1341,7 @@ var/list/robot_verbs_default = list(
lockcharge = null
return
overlays -= "eyes"
updateicon()
update_icons()
if (triesleft >= 1)
var/choice = input("Look at your icon - is this what you want?") in list("Yes","No")
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -12
View File
@@ -83,7 +83,6 @@
New()
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/weapon/melee/baton/loaded(src)
src.modules += new /obj/item/weapon/extinguisher(src)
@@ -103,7 +102,6 @@
)
New()
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/device/healthanalyzer/advanced(src)
src.modules += new /obj/item/device/reagent_scanner/adv(src)
@@ -153,7 +151,6 @@
)
New()
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weapon/rcd/borg(src)
@@ -203,7 +200,6 @@
New()
src.modules += new /obj/item/device/flashlight/seclite(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src)
src.modules += new /obj/item/weapon/melee/baton/loaded/robot(src)
@@ -219,7 +215,6 @@
New()
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/weapon/soap/nanotrasen(src)
src.modules += new /obj/item/weapon/storage/bag/trash/cyborg(src)
@@ -239,7 +234,6 @@
New()
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
@@ -309,7 +303,6 @@
New()
src.modules += new /obj/item/device/flashlight/lantern(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weapon/wrench(src)
@@ -327,7 +320,6 @@
/obj/item/weapon/robot_module/deathsquad/New()
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/borg/sight/thermal(src)
src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src)
@@ -341,7 +333,6 @@
/obj/item/weapon/robot_module/syndicate/New()
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src)
src.modules += new /obj/item/weapon/gun/energy/printer(src)
src.modules += new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi/cyborg(src)
@@ -356,7 +347,6 @@
name = "combat robot module"
New()
src.modules += new /obj/item/device/flashlight(src)
src.modules += new /obj/item/device/flash/cyborg(src)
src.modules += new /obj/item/borg/sight/thermal(src)
src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src)
@@ -415,8 +405,7 @@
src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
src.modules += new /obj/item/weapon/soap(src)
src.emag = new /obj/item/weapon/gun/energy/plasmacutter(src)
src.emag.name = "Plasma Cutter"
src.emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
for(var/T in stacktypes)
var/obj/item/stack/sheet/W = new T(src)
code/modules/mob/living/simple_animal/friendly/butterfly.dm
+2 -2
View File
@@ -8,7 +8,7 @@
emote_see = list("flutters")
response_help = "shoos"
response_disarm = "brushes aside"
response_harm = "aquashes"
response_harm = "squashes"
speak_chance = 0
maxHealth = 2
health = 2
@@ -20,4 +20,4 @@
/mob/living/simple_animal/butterfly/New()
..()
color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+2 -2
View File
@@ -262,8 +262,8 @@
OpenFire()
/mob/living/simple_animal/hostile/asteroid/hivelord/Die()
new /obj/item/asteroid/hivelord_core(src.loc)
mouse_opacity = 1
if(stat != DEAD)
new /obj/item/asteroid/hivelord_core(src.loc)
..()
/obj/item/asteroid/hivelord_core
code/modules/mob/living/simple_animal/revenant/revenant.dm
+3 -3
View File
@@ -43,7 +43,7 @@
strikes--
src << "<span class='boldannounce'>Your essence has dropped below critical levels. You barely manage to save yourself - [strikes ? "you can't keep this up!" : "next time, it's death."]</span>"
else if(strikes <= 0)
death()
Die()
maxHealth = essence * 2
if(!revealed)
health = maxHealth //Heals to full when not revealed
@@ -123,10 +123,10 @@
return 1
return 0
/mob/living/simple_animal/revenant/death()
/mob/living/simple_animal/revenant/Die()
if(strikes)
return 0 //Impossible to die with strikes still active
..(1)
..()
src << "<span class='userdanger'><b>NO! No... it's too late, you can feel yourself fading...</b></span>"
notransform = 1
revealed = 1
code/modules/organs/organ_icon.dm
+3
View File
@@ -32,6 +32,9 @@ var/global/list/limb_icon_cache = list()
..()
overlays.Cut()
if(!owner)
return
if(owner.species.has_organ["eyes"])
var/obj/item/organ/eyes/eyes = owner.internal_organs_by_name["eyes"]
if(owner.species.eyes)
code/modules/projectiles/guns/energy/special.dm
+2
View File
@@ -236,6 +236,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
charge_cost = 5000
cell_type = "/obj/item/weapon/stock_parts/cell/emproof"
fire_delay = 16 //Because guncode is bad and you can bug the reload for rapid fire otherwise.
var/overheat = 0
var/overheat_time = 16
var/recent_reload = 1
@@ -277,6 +278,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
projectile_type = "/obj/item/projectile/energy/bolt"
fire_sound = 'sound/weapons/Genhit.ogg'
overheat_time = 20
fire_delay = 20
/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large
name = "energy crossbow"
code/modules/reagents/Chemistry-Machinery.dm
+1 -1
View File
@@ -950,7 +950,7 @@
return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(var/obj/item/weapon/reagent_containers/food/snacks/O)
for(var/i in juice_tags)
for(var/i in juice_items)
if(istype(O, i))
return juice_items[i]
code/modules/reagents/reagent_containers/food/snacks/candy.dm
+43 -43
View File
@@ -168,18 +168,18 @@
New()
..()
reagents.add_reagent("sugar" = 10)
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin."
icon_state = "gworm"
filling_color = "#FFFFFF"
New()
..()
reagents.add_reagent("sugar" = 10)
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean
@@ -190,7 +190,7 @@
New()
..()
reagents.add_reagent("sugar" = 10)
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker
@@ -201,7 +201,7 @@
New()
..()
reagents.add_reagent("sugar" = 10)
reagents.add_reagent("sugar", 10)
bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift.
/obj/item/weapon/reagent_containers/food/snacks/candy/cash
@@ -239,7 +239,7 @@
New()
..()
reagents.add_reagent("sugar" = 5)
reagents.add_reagent("sugar", 5)
bitesize = 0.2
/obj/item/weapon/reagent_containers/food/snacks/candy/sucker
@@ -250,7 +250,7 @@
New()
..()
reagents.add_reagent("sugar" = 10)
reagents.add_reagent("sugar", 10)
bitesize = 1
// ***********************************************************
@@ -265,7 +265,7 @@
New()
..()
reagents.add_reagent("cherryjelly" = 2)
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue
@@ -276,7 +276,7 @@
New()
..()
reagents.add_reagent("berryjuice" = 2)
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison
@@ -287,7 +287,7 @@
New()
..()
reagents.add_reagent("poisonberryjuice" = 12)
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
@@ -301,7 +301,7 @@
New()
..()
reagents.add_reagent("limejuice" = 2)
reagents.add_reagent("limejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow
@@ -312,7 +312,7 @@
New()
..()
reagents.add_reagent("lemonjuice" = 2)
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange
@@ -323,7 +323,7 @@
New()
..()
reagents.add_reagent("orangejuice" = 2)
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple
@@ -334,7 +334,7 @@
New()
..()
reagents.add_reagent("grapejuice" = 2)
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf
@@ -345,7 +345,7 @@
New()
..()
reagents.add_reagent("space_drugs" = 2)
reagents.add_reagent("space_drugs", 2)
bitesize = 3
@@ -354,93 +354,93 @@
// ***********************************************************
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/red
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's red!"
icon_state = "gworm_red"
filling_color = "#801E28"
New()
..()
reagents.add_reagent("cherryjelly" = 2)
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863333"
New()
..()
reagents.add_reagent("berryjuice" = 2)
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863353"
New()
..()
reagents.add_reagent("poisonberryjuice" = 12)
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's green!"
icon_state = "gworm_green"
filling_color = "#365E30"
New()
..()
reagents.add_reagent("limejuice" = 10)
reagents.add_reagent("limejuice", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's yellow!"
icon_state = "gworm_yellow"
filling_color = "#863333"
New()
..()
reagents.add_reagent("lemonjuice" = 2)
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's orange!"
icon_state = "gworm_orange"
filling_color = "#E78108"
New()
..()
reagents.add_reagent("orangejuice" = 2)
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's purple!"
icon_state = "gworm_purple"
filling_color = "#993399"
New()
..()
reagents.add_reagent("grapejuice" = 2)
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf
name = "gummy bear"
name = "gummy worm"
desc = "An edible worm. Did it just move?"
icon_state = "gworm_wtf"
filling_color = "#60A584"
New()
..()
reagents.add_reagent("space_drugs" = 2)
reagents.add_reagent("space_drugs", 2)
bitesize = 3
@@ -456,7 +456,7 @@
New()
..()
reagents.add_reagent("cherryjelly" = 2)
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue
@@ -467,7 +467,7 @@
New()
..()
reagents.add_reagent("berryjuice" = 2)
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison
@@ -478,7 +478,7 @@
New()
..()
reagents.add_reagent("poisonberryjuice" = 12)
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
@@ -491,7 +491,7 @@
New()
..()
reagents.add_reagent("limejuice" = 10)
reagents.add_reagent("limejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow
@@ -502,7 +502,7 @@
New()
..()
reagents.add_reagent("lemonjuice" = 2)
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange
@@ -513,7 +513,7 @@
New()
..()
reagents.add_reagent("orangejuice" = 2)
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple
@@ -524,7 +524,7 @@
New()
..()
reagents.add_reagent("grapejuice" = 2)
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate
@@ -546,7 +546,7 @@
New()
..()
reagents.add_reagent("nutriment" = 2)
reagents.add_reagent("nutriment", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola
@@ -557,7 +557,7 @@
New()
..()
reagents.add_reagent("cola" = 2)
reagents.add_reagent("cola", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb
@@ -568,7 +568,7 @@
New()
..()
reagents.add_reagent("dr_gibb" = 2)
reagents.add_reagent("dr_gibb", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee
@@ -579,7 +579,7 @@
New()
..()
reagents.add_reagent("coffee" = 2)
reagents.add_reagent("coffee", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf
@@ -590,7 +590,7 @@
New()
..()
reagents.add_reagent("space_drugs" = 2)
reagents.add_reagent("space_drugs", 2)
bitesize = 3
// ***********************************************************
code/modules/research/designs/mining_designs.dm
+1 -1
View File
@@ -9,7 +9,7 @@
build_type = PROTOLATHE
materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
reliability_base = 79
build_path = /obj/item/weapon/pickaxe/diamonddrill
build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
category = list("Mining")
/datum/design/pick_diamond