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

Merge conflict fix

Browse Source
This commit is contained in:
shazbot194
2018-04-04 12:18:07 -08:00
parent 5573a9b36a d1cdcfead0
commit 234c8a78bc
496 changed files with 10865 additions and 3464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -4,12 +4,12 @@
icon = 'icons/obj/closet.dmi'
icon_state = "closed"
density = 1
armor = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0)
var/icon_closed = "closed"
var/icon_opened = "open"
var/opened = 0
var/welded = 0
var/locked = 0
var/broken = 0
var/wall_mounted = 0 //never solid (You can always pass over it)
var/health = 100
var/lastbang
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+1
View File
@@ -8,6 +8,7 @@
icon_opened = "fireaxe1100"
anchored = 1
density = 0
armor = list(melee = 50, bullet = 50, laser = 50, energy = 100, bomb = 10, bio = 100, rad = 100)
var/localopened = 0 //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
opened = 1
var/hitstaken = 0
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+1
View File
@@ -35,6 +35,7 @@
new /obj/item/clothing/head/beret/eng(src)
new /obj/item/weapon/door_remote/chief_engineer(src)
new /obj/item/weapon/rpd(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/ce(src)
/obj/structure/closet/secure_closet/engineering_electrical
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+15 -1
View File
@@ -111,8 +111,15 @@
..()
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
new /obj/item/weapon/reagent_containers/food/pill/patch/nicotine(src)
new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src)
new /obj/item/weapon/reagent_containers/food/pill/hydrocodone(src)
/obj/structure/closet/secure_closet/psychiatrist
name = "psychiatrist's locker"
@@ -129,8 +136,14 @@
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/reagent_containers/glass/bottle/ether(src)
new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
new /obj/item/weapon/storage/pill_bottle/psychiatrist(src)
new /obj/random/plushie(src)
for(var/i in 0 to 3)
var/candy = pick(subtypesof(/obj/item/weapon/reagent_containers/food/snacks/candy/fudge))
new candy(src)
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
@@ -173,6 +186,7 @@
new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
new /obj/item/weapon/door_remote/chief_medical_officer(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/cmo(src)
/obj/structure/closet/secure_closet/animal
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1
View File
@@ -71,6 +71,7 @@
new /obj/item/device/flash(src)
new /obj/item/device/laser_pointer(src)
new /obj/item/weapon/door_remote/research_director(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/rd(src)
/obj/structure/closet/secure_closet/research_reagents
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+1
View File
@@ -7,6 +7,7 @@
opened = 0
locked = 1
broken = 0
armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0)
var/large = 1
icon_closed = "secure"
var/icon_locked = "secure1"
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+6 -1
View File
@@ -31,6 +31,7 @@
new /obj/item/weapon/storage/belt/rapier(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/door_remote/captain(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/cap(src)
/obj/structure/closet/secure_closet/hop
@@ -52,10 +53,11 @@
new /obj/item/weapon/storage/box/ids(src)
new /obj/item/weapon/storage/box/PDAs(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun/mini(src)
new /obj/item/device/flash(src)
new /obj/item/clothing/accessory/petcollar(src)
new /obj/item/weapon/door_remote/civillian(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/hop(src)
/obj/structure/closet/secure_closet/hop2
@@ -120,6 +122,7 @@
new /obj/item/taperoll/police(src)
new /obj/item/weapon/gun/energy/gun/hos(src)
new /obj/item/weapon/door_remote/head_of_security(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/hos(src)
/obj/structure/closet/secure_closet/warden
@@ -346,6 +349,8 @@
new /obj/item/clothing/glasses/sunglasses/yeah(src)
new /obj/item/device/flashlight/seclite(src)
new /obj/item/clothing/accessory/black(src)
new /obj/item/device/taperecorder(src)
new /obj/item/weapon/storage/box/tapes(src)
/obj/structure/closet/secure_closet/detective/update_icon()
if(broken)