cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
This commit is contained in:
Markolie
2017-02-05 19:46:41 +01:00
parent 063b5728ad 9127d07b4e
commit 83cd030134
493 changed files with 16686 additions and 11140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+11 -25
View File
@@ -16,6 +16,7 @@
var/cutting_sound = 'sound/items/Welder.ogg'
var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
var/material_drop = /obj/item/stack/sheet/metal
var/material_drop_amount = 2
/obj/structure/closet/New()
..()
@@ -49,28 +50,13 @@
return 1
/obj/structure/closet/proc/dump_contents()
//Cham Projector Exception
for(var/obj/effect/dummy/chameleon/AD in src)
AD.forceMove(loc)
for(var/obj/I in src)
I.forceMove(loc)
for(var/mob/M in src)
moveMob(M, loc)
/obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
loc.Exited(M)
M.loc = destination
M.reset_perspective(destination)
if(isturf(loc))
loc.Entered(M, src, ignoreRest = 1)
else
loc.Entered(M, src)
for(var/atom/movable/AM in loc)
if(istype(AM, /obj/item))
continue
AM.Crossed(M)
var/turf/T = get_turf(src)
for(var/atom/movable/AM in src)
AM.forceMove(T)
if(throwing) // you keep some momentum when getting out of a thrown closet
step(AM, dir)
if(throwing)
throwing = 0
/obj/structure/closet/proc/open()
if(src.opened)
@@ -120,7 +106,7 @@
if(M.buckled)
continue
moveMob(M, src)
M.forceMove(src)
itemcount++
src.icon_state = src.icon_closed
@@ -271,7 +257,7 @@
"<span class='notice'>You cut \the [src] apart with \the [WT].</span>",
"<span class='italics'>You hear welding.</span>")
var/turf/T = get_turf(src)
new material_drop(T)
new material_drop(T, material_drop_amount)
qdel(src)
return
if(isrobot(user))
@@ -425,4 +411,4 @@
/obj/structure/closet/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+15 -15
View File
@@ -9,18 +9,18 @@
icon_off = "hydrosecureoff"
New()
..()
switch(rand(1,2))
if(1)
new /obj/item/clothing/suit/apron(src)
if(2)
new /obj/item/clothing/suit/apron/overalls(src)
new /obj/item/weapon/storage/bag/plants/portaseeder(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/mask/bandana/botany(src)
new /obj/item/weapon/minihoe(src)
new /obj/item/weapon/hatchet(src)
/obj/structure/closet/secure_closet/hydroponics/New()
..()
switch(rand(1,2))
if(1)
new /obj/item/clothing/suit/apron(src)
if(2)
new /obj/item/clothing/suit/apron/overalls(src)
new /obj/item/weapon/storage/bag/plants/portaseeder(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/mask/bandana/botany(src)
new /obj/item/weapon/cultivator(src)
new /obj/item/weapon/hatchet(src)
new /obj/item/weapon/storage/box/disks_plantgene(src)
code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
+1 -1
View File
@@ -18,7 +18,7 @@
new /obj/item/weapon/bikehorn(src)
new /obj/item/weapon/reagent_containers/spray/waterflower(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/seeds/bananaseed(src)
new /obj/item/seeds/banana(src)
code/game/objects/structures/crates_lockers/closets/statue.dm
+6 -12
View File
@@ -57,10 +57,9 @@
qdel(src)
/obj/structure/closet/statue/dump_contents()
if(istype(src.loc, /mob/living/simple_animal/hostile/statue))
var/mob/living/simple_animal/hostile/statue/S = src.loc
src.loc = S.loc
if(istype(loc, /mob/living/simple_animal/hostile/statue))
var/mob/living/simple_animal/hostile/statue/S = loc
forceMove(S.loc)
if(S.mind)
for(var/mob/M in contents)
S.mind.transfer_to(M)
@@ -68,21 +67,16 @@
break
qdel(S)
for(var/obj/O in src)
O.loc = src.loc
for(var/mob/living/M in src)
M.forceMove(loc)
M.disabilities -= MUTE
M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
..()
/obj/structure/closet/statue/open()
return
/obj/structure/closet/statue/open()
return
@@ -158,4 +152,4 @@ obj/structure/statue/angel
icon_state = "angelseen"
obj/structure/statue/corgi
icon_state = "corgi"
icon_state = "corgi"
code/game/objects/structures/crates_lockers/crates.dm
-2
View File
@@ -568,8 +568,6 @@
new /obj/item/weapon/wirecutters(src)
new /obj/item/weapon/shovel/spade(src)
new /obj/item/weapon/shovel/spade(src)
new /obj/item/weapon/storage/box/botanydisk(src)
new /obj/item/weapon/storage/box/botanydisk(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/hand_labeler(src)
code/game/objects/structures/flora.dm
+8
View File
@@ -36,6 +36,14 @@
..()
icon_state = "tree_[rand(1, 6)]"
/obj/structure/flora/tree/palm
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
/obj/structure/flora/tree/palm/New()
..()
icon_state = pick("palm1","palm2")
pixel_x = 0
//grass
/obj/structure/flora/grass