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

Merge remote-tracking branch 'upstream/master' into mechastuff

Browse Source 
# Conflicts:
#	code/game/mecha/mecha.dm
This commit is contained in:
tigercat2000
2018-11-01 08:37:46 -07:00
parent 6028fc83c3 11f9b819e4
commit d6a852bcfa
22 changed files with 227 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/arcade/prize_datums.dm
+3
View File
@@ -9,6 +9,9 @@ var/global/datum/prizes/global_prizes = new
prizes += new itempath()
/datum/prizes/proc/PlaceOrder(var/obj/machinery/prize_counter/prize_counter, var/itemID)
if(!prize_counter.Adjacent(usr))
to_chat(usr, "<span class='warning'>You need to be closer!</span>")
return
if(!prize_counter)
return 0
var/datum/prize_item/item = global_prizes.prizes[itemID]
code/modules/hydroponics/grown/chili.dm
+5 -5
View File
@@ -28,11 +28,11 @@
// Ice Chili
/obj/item/seeds/chili/ice
name = "pack of ice pepper seeds"
desc = "These seeds grow into ice pepper plants."
name = "pack of chilly pepper seeds"
desc = "These seeds grow into chilly pepper plants."
icon_state = "seed-icepepper"
species = "chiliice"
plantname = "Ice Pepper Plants"
plantname = "Chilly Pepper Plants"
product = /obj/item/reagent_containers/food/snacks/grown/icepepper
lifespan = 25
maturation = 4
@@ -43,7 +43,7 @@
/obj/item/reagent_containers/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "ice pepper"
name = "chilly pepper"
desc = "It's a mutant strain of chili"
icon_state = "icepepper"
filling_color = "#0000CD"
@@ -73,4 +73,4 @@
icon_state = "ghostchilipepper"
filling_color = "#F8F8FF"
bitesize_mod = 4
origin_tech = "biotech=4;magnets=5"
origin_tech = "biotech=4;magnets=5"
code/modules/mob/living/carbon/give.dm
+1 -1
View File
@@ -29,7 +29,7 @@
if("Yes")
if(!I)
return
if(!Adjacent(usr))
if(!Adjacent(target))
to_chat(usr, "<span class='warning'> You need to stay in reaching distance while giving an object.</span>")
to_chat(target, "<span class='warning'> [usr.name] moved too far away.</span>")
return
code/modules/mob/living/silicon/robot/drone/drone.dm
+6 -2
View File
@@ -132,7 +132,7 @@
to_chat(user, "<span class='warning'>The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.</span>")
return
if(!allowed(usr))
if(!allowed(W))
to_chat(user, "<span class='warning'>Access denied.</span>")
return
@@ -158,7 +158,7 @@
if(emagged)
return
if(allowed(usr))
if(allowed(W))
shut_down()
else
to_chat(user, "<span class='warning'>Access denied.</span>")
@@ -223,6 +223,10 @@
health = 35 - (getBruteLoss() + getFireLoss())
update_stat("updatehealth([reason])")
/mob/living/silicon/robot/drone/death(gibbed)
. = ..(gibbed)
ghostize(can_reenter_corpse = 0)
//CONSOLE PROCS
/mob/living/silicon/robot/drone/proc/law_resync()
code/modules/paperwork/paper_bundle.dm
+2 -1
View File
@@ -71,7 +71,8 @@
update_icon()
attack_self(usr) //Update the browsed page.
if(winget(usr, "[name]", "is-visible") == "true") // NOT MY FAULT IT IS A BUILT IN PROC PLEASE DO NOT HIT ME
attack_self(usr) //Update the browsed page.
add_fingerprint(usr)
return
code/modules/reagents/chemistry/reagents/drink_cold.dm
+2 -2
View File
@@ -163,12 +163,12 @@
/datum/reagent/consumable/drink/cold/rewriter
name = "Rewriter"
description = "The secert of the sanctuary of the Libarian..."
description = "The secret of the sanctuary of the Librarian..."
id = "rewriter"
color = "#485000" // rgb:72, 080, 0
drink_icon = "rewriter"
drink_name = "Rewriter"
drink_desc = "The secert of the sanctuary of the Libarian..."
drink_desc = "The secret of the sanctuary of the Librarian..."
taste_message = "coffee...soda?"
/datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M)
code/modules/recycling/disposal.dm
+38 -35
View File
@@ -46,7 +46,7 @@
T.nicely_link_to_other_stuff(src)
//When the disposalsoutlet is forcefully moved. Due to meteorshot (not the recall spell)
/obj/machinery/disposal/Moved(atom/OldLoc, Dir)
/obj/machinery/disposal/Moved(atom/OldLoc, Dir)
. = ..()
eject()
var/ptype = istype(src, /obj/machinery/disposal/deliveryChute) ? PIPE_DISPOSALS_CHUTE : PIPE_DISPOSALS_BIN //Check what disposaltype it is
@@ -1220,24 +1220,27 @@
// if not entering from disposal bin,
// transfer to linked object (outlet or bin)
/obj/structure/disposalpipe/trunk/transfer(var/obj/structure/disposalholder/H)
/obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H)
if(!H)
return
if(H.dir == DOWN) // we just entered from a disposer
return ..() // so do base transfer proc
// otherwise, go to the linked object
if(linked)
var/obj/structure/disposaloutlet/O = linked
if(istype(O) && (H))
O.expel(H) // expel at outlet
else
var/obj/machinery/disposal/D = linked
if(H)
D.expel(H) // expel at disposal
else
if(H)
src.expel(H, src.loc, 0) // expel at turf
return null
if(!linked)
expel(H, loc, FALSE) // expel at turf
else if(istype(linked, /obj/structure/disposaloutlet))
var/obj/structure/disposaloutlet/DO = linked
for(var/atom/movable/AM in H)
AM.forceMove(DO)
qdel(H)
H.vent_gas(loc)
DO.expel()
else if(istype(linked, /obj/machinery/disposal))
var/obj/machinery/disposal/D = linked
H.forceMove(D)
D.expel(H) // expel at disposal
else //just in case
expel(H, loc, FALSE)
// nextdir
/obj/structure/disposalpipe/trunk/nextdir(var/fromdir)
@@ -1283,24 +1286,29 @@
if(T)
T.nicely_link_to_other_stuff(src)
// expel the contents of the holder object, then delete it
// called when the holder exits the outlet
/obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H, animation = 1)
/obj/structure/disposaloutlet/Destroy()
if(linkedtrunk)
linkedtrunk.remove_trunk_links()
expel(FALSE)
return ..()
// expel the contents of the outlet
/obj/structure/disposaloutlet/proc/expel(animation = TRUE)
if(animation)
flick("outlet-open", src)
playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
sleep(20) //wait until correct animation frame
playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
if(H)
for(var/atom/movable/AM in H)
AM.forceMove(loc)
AM.pipe_eject(dir)
if(!istype(AM,/mob/living/silicon/robot/drone)) //Drones keep smashing windows from being fired out of chutes. Bad for the station. ~Z
spawn(5)
if(AM)
AM.throw_at(target, 3, 1)
H.vent_gas(src.loc)
qdel(H)
for(var/atom/movable/AM in contents)
AM.forceMove(loc)
AM.pipe_eject(dir)
if(istype(AM,/mob/living/silicon/robot/drone)) //Drones keep smashing windows from being fired out of chutes. Bad for the station. ~Z
return
spawn(5)
if(QDELETED(AM))
return
AM.throw_at(target, 3, 1)
/obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user, params)
@@ -1339,7 +1347,7 @@
return
//When the disposalsoutlet is forcefully moved. Due to meteorshot or the recall item spell for instance
/obj/structure/disposaloutlet/Moved(atom/OldLoc, Dir)
/obj/structure/disposaloutlet/Moved(atom/OldLoc, Dir)
. = ..()
var/turf/T = OldLoc
if(T.intact)
@@ -1356,11 +1364,6 @@
C.density = 1
qdel(src)
/obj/structure/disposaloutlet/Destroy()
if(linkedtrunk)
linkedtrunk.remove_trunk_links()
return ..()
// called when movable is expelled from a disposal pipe or outlet
// by default does nothing, override for special behaviour
code/modules/spacepods/spacepod.dm
+3
View File
@@ -199,6 +199,9 @@
deal_damage(P.damage)
P.on_hit(src)
/obj/spacepod/AllowDrop()
return TRUE
/obj/spacepod/blob_act()
deal_damage(30)
return