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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things

Browse Source 
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
This commit is contained in:
Anewbe
2017-04-01 12:45:45 -05:00
parent 2de037fbbf acee0a225f
commit 7bb3f5fbb7
659 changed files with 19000 additions and 10384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+2 -2
View File
@@ -65,8 +65,8 @@
new /obj/item/clothing/head/helmet/swat(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/shoes/swat(src)
new /obj/item/clothing/shoes/swat(src)
new /obj/item/clothing/shoes/boots/swat(src)
new /obj/item/clothing/shoes/boots/swat(src)
new /obj/item/clothing/suit/armor/swat(src)
new /obj/item/clothing/suit/armor/swat(src)
new /obj/item/clothing/under/syndicate/tacticool(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1
View File
@@ -142,6 +142,7 @@
new /obj/item/clothing/suit/storage/toggle/labcoat/emt(src)
new /obj/item/device/radio/headset/headset_med/alt(src)
new /obj/item/weapon/cartridge/medical(src)
new /obj/item/weapon/storage/briefcase/inflatable(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
new /obj/item/clothing/glasses/hud/health(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+10 -10
View File
@@ -29,9 +29,9 @@
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/under/rank/security2(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
@@ -191,8 +191,8 @@
new /obj/item/clothing/shoes/sandal(src)
new /obj/item/clothing/shoes/footwraps(src)
new /obj/item/clothing/shoes/footwraps(src)
new /obj/item/clothing/shoes/winterboots(src)
new /obj/item/clothing/shoes/winterboots(src)
new /obj/item/clothing/shoes/boots/winter(src)
new /obj/item/clothing/shoes/boots/winter(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat(src)
return
@@ -295,9 +295,9 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
return
@@ -565,7 +565,7 @@
new /obj/item/weapon/storage/belt/security/tactical(src)
if(prob(10))
new /obj/item/clothing/mask/bandana/skull(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/boots/jackboots(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/under/pants/camo(src)
return
@@ -583,7 +583,7 @@
new /obj/item/clothing/under/syndicate/combat(src)
new /obj/item/device/radio/headset/ert/alt(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/shoes/swat(src)
new /obj/item/clothing/shoes/boots/swat(src)
new /obj/item/clothing/gloves/swat(src)
new /obj/item/clothing/mask/balaclava/tactical(src)
new /obj/item/clothing/mask/balaclava(src)
code/game/objects/structures/crates_lockers/crates.dm
+34 -3
View File
@@ -283,9 +283,9 @@
/obj/structure/closet/crate/rcd
name = "\improper RCD crate"
desc = "A crate with rapid construction device."
icon_state = "crate"
icon_opened = "crateopen"
icon_closed = "crate"
icon_state = "engi_crate"
icon_opened = "engi_crateopen"
icon_closed = "engi_crate"
/obj/structure/closet/crate/rcd/New()
..()
@@ -427,6 +427,20 @@
icon_opened = "hydrosecurecrateopen"
icon_closed = "hydrosecurecrate"
/obj/structure/closet/crate/secure/engineering
desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
name = "secure engineering crate"
icon_state = "engi_secure_crate"
icon_opened = "engi_secure_crateopen"
icon_closed = "engi_secure_crate"
/obj/structure/closet/crate/secure/science
name = "secure science crate"
desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
icon_state = "scisecurecrate"
icon_opened = "scisecurecrateopen"
icon_closed = "scisecurecrate"
/obj/structure/closet/crate/secure/bin
name = "secure bin"
desc = "A secure bin."
@@ -499,6 +513,23 @@
icon_opened = "largermetalopen"
icon_closed = "largermetal"
/obj/structure/closet/crate/engineering
name = "engineering crate"
icon_state = "engi_crate"
icon_opened = "engi_crateopen"
icon_closed = "engi_crate"
/obj/structure/closet/crate/engineering/electrical
icon_state = "engi_e_crate"
icon_opened = "engi_crateopen"
icon_closed = "engi_e_crate"
/obj/structure/closet/crate/science
name = "science crate"
icon_state = "scicrate"
icon_opened = "scicrateopen"
icon_closed = "scicrate"
/obj/structure/closet/crate/hydroponics
name = "hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
code/game/objects/structures/crates_lockers/largecrate.dm
+1 -1
View File
@@ -72,7 +72,7 @@
/obj/structure/largecrate/animal/goat
name = "goat crate"
held_type = /mob/living/simple_animal/hostile/retaliate/goat
held_type = /mob/living/simple_animal/retaliate/goat
/obj/structure/largecrate/animal/cat
name = "cat carrier"
code/game/objects/structures/door_assembly.dm
+10
View File
@@ -107,6 +107,16 @@
airlock_type = "/highsecurity"
glass = -1
/obj/structure/door_assembly/door_assembly_voidcraft
base_icon_state = "voidcraft"
base_name = "voidcraft hatch"
airlock_type = "/voidcraft"
glass = -1
/obj/structure/door_assembly/door_assembly_voidcraft/vertical
base_icon_state = "voidcraft_vertical"
airlock_type = "/voidcraft/vertical"
/obj/structure/door_assembly/multi_tile
icon = 'icons/obj/doors/door_assembly2x1.dmi'
dir = EAST
code/game/objects/structures/flora.dm
+159 -5
View File
@@ -32,6 +32,19 @@
..()
icon_state = "tree_[rand(1, 6)]"
/obj/structure/flora/tree/sif
name = "glowing tree"
desc = "It's a tree, except this one seems quite alien. It glows a deep blue."
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_sif"
/obj/structure/flora/tree/sif/New()
update_icon()
/obj/structure/flora/tree/sif/update_icon()
set_light(5, 1, "#33ccff")
overlays.Cut()
overlays.Add(image(icon = 'icons/obj/flora/deadtrees.dmi', icon_state = "[icon_state]_glow", layer = LIGHTING_LAYER + 0.1))
//grass
/obj/structure/flora/grass
@@ -79,10 +92,6 @@
icon = 'icons/obj/plants.dmi'
icon_state = "plant-26"
/obj/structure/flora/pottedplant/xmas/New()
..()
icon_state = "plant-xmas"
//newbushes
@@ -205,4 +214,149 @@
name = "hanging skeleton model"
icon = 'icons/obj/plants.dmi'
icon_state = "hangskele"
desc = "It's an anatomical model of a human skeletal system made of plaster."
desc = "It's an anatomical model of a human skeletal system made of plaster."
//potted plants credit: Flashkirby
/obj/structure/flora/pottedplant
name = "potted plant"
desc = "Really brings the room together."
icon = 'icons/obj/plants.dmi'
icon_state = "plant-01"
/obj/structure/flora/pottedplant/large
name = "large potted plant"
desc = "This is a large plant. Three branches support pairs of waxy leaves."
icon_state = "plant-26"
/obj/structure/flora/pottedplant/fern
name = "potted fern"
desc = "This is an ordinary looking fern. It looks like it could do with some water."
icon_state = "plant-02"
/obj/structure/flora/pottedplant/overgrown
name = "overgrown potted plants"
desc = "This is an assortment of colourful plants. Some parts are overgrown."
icon_state = "plant-03"
/obj/structure/flora/pottedplant/bamboo
name = "potted bamboo"
desc = "These are bamboo shoots. The tops looks like they've been cut short."
icon_state = "plant-04"
/obj/structure/flora/pottedplant/largebush
name = "large potted bush"
desc = "This is a large bush. The leaves stick upwards in an odd fashion."
icon_state = "plant-05"
/obj/structure/flora/pottedplant/thinbush
name = "thin potted bush"
desc = "This is a thin bush. It appears to be flowering."
icon_state = "plant-06"
/obj/structure/flora/pottedplant/mysterious
name = "mysterious potted bulbs"
desc = "This is a mysterious looking plant. Touching the bulbs cause them to shrink."
icon_state = "plant-07"
/obj/structure/flora/pottedplant/smalltree
name = "small potted tree"
desc = "This is a small tree. It is rather pleasant."
icon_state = "plant-08"
/obj/structure/flora/pottedplant/unusual
name = "unusual potted plant"
desc = "This is an unusual plant. It's bulbous ends emit a soft blue light."
icon_state = "plant-09"
set_light(l_range = 1, l_power = 0.5, l_color = "#0000FF")
/obj/structure/flora/pottedplant/orientaltree
name = "potted oriental tree"
desc = "This is a rather oriental style tree. It's flowers are bright pink."
icon_state = "plant-10"
/obj/structure/flora/pottedplant/smallcactus
name = "small potted cactus"
desc = "This is a small cactus. Its needles are sharp."
icon_state = "plant-11"
/obj/structure/flora/pottedplant/tall
name = "tall potted plant"
desc = "This is a tall plant. Tiny pores line its surface."
icon_state = "plant-12"
/obj/structure/flora/pottedplant/sticky
name = "styicky potted plant"
desc = "This is an odd plant. Its sticky leaves trap insects."
icon_state = "plant-13"
/obj/structure/flora/pottedplant/smelly
name = "smelly potted plant"
desc = "This is some kind of tropical plant. It reeks of rotten eggs."
icon_state = "plant-14"
/obj/structure/flora/pottedplant/small
name = "small potted plant"
desc = "This is a pot of assorted small flora. Some look familiar."
icon_state = "plant-15"
/obj/structure/flora/pottedplant/aquatic
name = "aquatic potted plant"
desc = "This is apparently an aquatic plant. It's probably fake."
icon_state = "plant-16"
/obj/structure/flora/pottedplant/shoot
name = "small potted shoot"
desc = "This is a small shoot. It still needs time to grow."
icon_state = "plant-17"
/obj/structure/flora/pottedplant/flower
name = "potted flower"
desc = "This is a slim plant. Sweet smelling flowers are supported by spindly stems."
icon_state = "plant-18"
/obj/structure/flora/pottedplant/crystal
name = "crystalline potted plant"
desc = "These are rather cubic plants. Odd crystal formations grow on the end."
icon_state = "plant-19"
/obj/structure/flora/pottedplant/subterranean
name = "subterranean potted plant"
desc = "This is a subterranean plant. It's bulbous ends glow faintly."
icon_state = "plant-20"
set_light(l_range = 1, l_power = 0.5, l_color = "#FF6633")
/obj/structure/flora/pottedplant/minitree
name = "potted tree"
desc = "This is a miniature tree. Apparently it was grown to 1/5 scale."
icon_state = "plant-21"
/obj/structure/flora/pottedplant/stoutbush
name = "stout potted bush"
desc = "This is a stout bush. Its leaves point up and outwards."
icon_state = "plant-22"
/obj/structure/flora/pottedplant/drooping
name = "drooping potted plant"
desc = "This is a small plant. The drooping leaves make it look like its wilted."
icon_state = "plant-23"
/obj/structure/flora/pottedplant/tropical
name = "tropical potted plant"
desc = "This is some kind of tropical plant. It hasn't begun to flower yet."
icon_state = "plant-24"
/obj/structure/flora/pottedplant/dead
name = "dead potted plant"
desc = "This is the dried up remains of a dead plant. Someone should replace it."
icon_state = "plant-25"
/obj/structure/flora/pottedplant/decorative
name = "decorative potted plant"
desc = "This is a decorative shrub. It's been trimmed into the shape of an apple."
icon_state = "applebush"
/obj/structure/flora/pottedplant/xmas
name = "small christmas tree"
desc = "This is a tiny well lit decorative christmas tree."
icon_state = "plant-xmas"
code/game/objects/structures/inflatable.dm
-1
View File
@@ -256,7 +256,6 @@
name = "inflatable barrier box"
desc = "Contains inflatable walls and doors."
icon_state = "inf_box"
item_state = "syringe_kit"
w_class = ITEMSIZE_NORMAL
max_storage_space = ITEMSIZE_COST_NORMAL * 7
can_hold = list(/obj/item/inflatable)
code/game/objects/structures/lattice.dm
+5
View File
@@ -34,6 +34,11 @@
if(locate(/obj/structure/lattice, get_step(src, dir)))
L = locate(/obj/structure/lattice, get_step(src, dir))
L.updateOverlays(src.loc)
if(istype(loc, /turf/simulated/open))
var/turf/simulated/open/O = loc
spawn(1)
if(O) // If we built a new floor with the lattice, the open turf won't exist anymore.
O.update() // This lattice may be supporting things on top of it. If it's being deleted, they need to fall down.
..()
/obj/structure/lattice/ex_act(severity)
code/game/objects/structures/signs.dm
+102
View File
@@ -122,6 +122,108 @@
desc = "A warning sign which reads 'NO SMOKING'."
icon_state = "nosmoking2"
/obj/structure/sign/warning
name = "\improper WARNING"
icon_state = "securearea"
/obj/structure/sign/warning/New()
..()
desc = "A warning sign which reads '[name]'."
/obj/structure/sign/warning/airlock
name = "\improper EXTERNAL AIRLOCK"
icon_state = "doors"
/obj/structure/sign/warning/biohazard
name = "\improper BIOHAZARD"
icon_state = "bio"
/obj/structure/sign/warning/bomb_range
name = "\improper BOMB RANGE"
icon_state = "blast"
/obj/structure/sign/warning/caution
name = "\improper CAUTION"
/obj/structure/sign/warning/compressed_gas
name = "\improper COMPRESSED GAS"
icon_state = "hikpa"
/obj/structure/sign/warning/deathsposal
name = "\improper DISPOSAL LEADS TO SPACE"
icon_state = "deathsposal"
/obj/structure/sign/warning/docking_area
name = "\improper KEEP CLEAR: DOCKING AREA"
/obj/structure/sign/warning/engineering_access
name = "\improper ENGINEERING ACCESS"
/obj/structure/sign/warning/fire
name = "\improper DANGER: FIRE"
icon_state = "fire"
/obj/structure/sign/warning/high_voltage
name = "\improper HIGH VOLTAGE"
icon_state = "shock"
/obj/structure/sign/warning/hot_exhaust
name = "\improper HOT EXHAUST"
icon_state = "fire"
/obj/structure/sign/warning/internals_required
name = "\improper INTERNALS REQUIRED"
/obj/structure/sign/warning/lethal_turrets
name = "\improper LETHAL TURRETS"
icon_state = "turrets"
/obj/structure/sign/warning/lethal_turrets/New()
..()
desc += " Enter at own risk!."
/obj/structure/sign/warning/mail_delivery
name = "\improper MAIL DELIVERY"
/obj/structure/sign/warning/moving_parts
name = "\improper MOVING PARTS"
/obj/structure/sign/warning/nosmoking_1
name = "\improper NO SMOKING"
icon_state = "nosmoking"
/obj/structure/sign/warning/nosmoking_2
name = "\improper NO SMOKING"
icon_state = "nosmoking2"
/obj/structure/sign/warning/pods
name = "\improper ESCAPE PODS"
icon_state = "pods"
/obj/structure/sign/warning/radioactive
name = "\improper RADIOACTIVE AREA"
icon_state = "radiation"
/obj/structure/sign/warning/secure_area
name = "\improper SECURE AREA"
/obj/structure/sign/warning/secure_area/armory
name = "\improper ARMORY"
/obj/structure/sign/warning/server_room
name = "\improper SERVER ROOM"
/obj/structure/sign/warning/siphon_valve
name = "\improper SIPHON VALVE"
/obj/structure/sign/warning/vacuum
name = "\improper HARD VACUUM AHEAD"
icon_state = "space"
/obj/structure/sign/warning/vent_port
name = "\improper EJECTION/VENTING PORT"
/obj/structure/sign/redcross
name = "medbay"
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -133,7 +133,7 @@
user << "<span class='notice'>\The [src] already has someone buckled to it.</span>"
return
user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>")
if(do_after(user, 20))
if(do_after(user, 20, G.affecting))
affecting.loc = loc
spawn(0)
if(buckle_mob(affecting))
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+4 -2
View File
@@ -150,20 +150,22 @@
var/def_zone = ran_zone()
var/blocked = occupant.run_armor_check(def_zone, "melee")
var/soaked = occupant.get_armor_soak(def_zone, "melee")
occupant.throw_at(A, 3, propelled)
occupant.apply_effect(6, STUN, blocked)
occupant.apply_effect(6, WEAKEN, blocked)
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, blocked)
occupant.apply_damage(10, BRUTE, def_zone, blocked, soaked)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
var/mob/living/victim = A
def_zone = ran_zone()
blocked = victim.run_armor_check(def_zone, "melee")
soaked = victim.get_armor_soak(def_zone, "melee")
victim.apply_effect(6, STUN, blocked)
victim.apply_effect(6, WEAKEN, blocked)
victim.apply_effect(6, STUTTER, blocked)
victim.apply_damage(10, BRUTE, def_zone, blocked)
victim.apply_damage(10, BRUTE, def_zone, blocked, soaked)
occupant.visible_message("<span class='danger'>[occupant] crashed into \the [A]!</span>")
/obj/structure/bed/chair/office/light
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+4 -2
View File
@@ -149,20 +149,22 @@
var/def_zone = ran_zone()
var/blocked = occupant.run_armor_check(def_zone, "melee")
var/soaked = occupant.get_armor_soak(def_zone, "melee")
occupant.throw_at(A, 3, propelled)
occupant.apply_effect(6, STUN, blocked)
occupant.apply_effect(6, WEAKEN, blocked)
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone)
occupant.apply_damage(10, BRUTE, def_zone, soaked)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
var/mob/living/victim = A
def_zone = ran_zone()
blocked = victim.run_armor_check(def_zone, "melee")
soaked = victim.get_armor_soak(def_zone, "melee")
victim.apply_effect(6, STUN, blocked)
victim.apply_effect(6, WEAKEN, blocked)
victim.apply_effect(6, STUTTER, blocked)
victim.apply_damage(10, BRUTE, def_zone)
victim.apply_damage(10, BRUTE, def_zone, soaked)
if(pulling)
occupant.visible_message("<span class='danger'>[pulling] has thrusted \the [name] into \the [A], throwing \the [occupant] out of it!</span>")
code/game/objects/structures/watercloset.dm
+5 -3
View File
@@ -18,8 +18,9 @@
/obj/structure/toilet/attack_hand(mob/living/user as mob)
if(swirlie)
usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
usr.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie.name]'s head!</span>", "<span class='notice'>You slam the toilet seat onto [swirlie.name]'s head!</span>", "You hear reverberating porcelain.")
swirlie.adjustBruteLoss(8)
swirlie.adjustBruteLoss(5)
return
if(cistern && !open)
@@ -53,6 +54,7 @@
return
if(istype(I, /obj/item/weapon/grab))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
var/obj/item/weapon/grab/G = I
if(isliving(G.affecting))
@@ -65,14 +67,14 @@
if(open && !swirlie)
user.visible_message("<span class='danger'>[user] starts to give [GM.name] a swirlie!</span>", "<span class='notice'>You start to give [GM.name] a swirlie!</span>")
swirlie = GM
if(do_after(user, 30, 5, 0))
if(do_after(user, 30, GM))
user.visible_message("<span class='danger'>[user] gives [GM.name] a swirlie!</span>", "<span class='notice'>You give [GM.name] a swirlie!</span>", "You hear a toilet flushing.")
if(!GM.internal)
GM.adjustOxyLoss(5)
swirlie = null
else
user.visible_message("<span class='danger'>[user] slams [GM.name] into the [src]!</span>", "<span class='notice'>You slam [GM.name] into the [src]!</span>")
GM.adjustBruteLoss(8)
GM.adjustBruteLoss(5)
else
user << "<span class='notice'>You need a tighter grip.</span>"