cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-22 20:56:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER

Browse Source
This commit is contained in:
kevinz000
2018-12-09 20:34:39 -08:00
parent 0a2178d01f 8430fe5434
commit ab3f30b28f
234 changed files with 1365 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/catwalk.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/maxhealth = 100
anchored = 1.0
/obj/structure/catwalk/initialize()
/obj/structure/catwalk/Initialize()
. = ..()
for(var/obj/structure/catwalk/O in range(1))
O.update_icon()
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -32,7 +32,7 @@
var/list/starts_with
/obj/structure/closet/initialize()
/obj/structure/closet/Initialize()
. = ..()
if(starts_with)
create_objects_in_loc(src, starts_with)
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+1 -1
View File
@@ -16,7 +16,7 @@
starts_with = list(/obj/item/weapon/material/twohanded/fireaxe)
/obj/structure/closet/fireaxecabinet/initialize()
/obj/structure/closet/fireaxecabinet/Initialize()
..()
fireaxe = locate() in contents
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+3 -3
View File
@@ -22,7 +22,7 @@
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft)
/obj/structure/closet/secure_closet/cargotech/initialize()
/obj/structure/closet/secure_closet/cargotech/Initialize()
if(prob(75))
starts_with += /obj/item/weapon/storage/backpack
else
@@ -59,7 +59,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
/obj/item/clothing/shoes/boots/winter/supply)
/obj/structure/closet/secure_closet/quartermaster/initialize()
/obj/structure/closet/secure_closet/quartermaster/Initialize()
if(prob(75))
starts_with += /obj/item/weapon/storage/backpack
else
@@ -93,7 +93,7 @@
/obj/item/clothing/shoes/boots/winter/mining,
/obj/item/stack/marker_beacon/thirty)
/obj/structure/closet/secure_closet/miner/initialize()
/obj/structure/closet/secure_closet/miner/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+3 -3
View File
@@ -32,7 +32,7 @@
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi)
/obj/structure/closet/secure_closet/engineering_chief/initialize()
/obj/structure/closet/secure_closet/engineering_chief/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
@@ -98,7 +98,7 @@
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi)
/obj/structure/closet/secure_closet/engineering_personal/initialize()
/obj/structure/closet/secure_closet/engineering_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
@@ -133,7 +133,7 @@
/obj/item/clothing/shoes/boots/winter/atmos,
/obj/item/weapon/tank/emergency/oxygen/engi)
/obj/structure/closet/secure_closet/atmos_personal/initialize()
/obj/structure/closet/secure_closet/atmos_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_opened = "base"
req_one_access = list(access_armory)
/obj/structure/closet/secure_closet/guncabinet/initialize()
/obj/structure/closet/secure_closet/guncabinet/Initialize()
. = ..()
update_icon()
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,
/obj/item/clothing/shoes/boots/winter/hydro)
/obj/structure/closet/secure_closet/hydroponics/initialize()
/obj/structure/closet/secure_closet/hydroponics/Initialize()
if(prob(50))
starts_with += /obj/item/clothing/suit/storage/apron
else
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+2 -2
View File
@@ -60,7 +60,7 @@
/obj/item/clothing/head/nursehat,
/obj/item/weapon/storage/box/freezer = 3)
/obj/structure/closet/secure_closet/medical3/initialize()
/obj/structure/closet/secure_closet/medical3/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
@@ -169,7 +169,7 @@
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white)
/obj/structure/closet/secure_closet/CMO/initialize()
/obj/structure/closet/secure_closet/CMO/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/medic
else
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+1 -1
View File
@@ -7,7 +7,7 @@
starts_with = list(
/obj/item/device/radio/headset)
/obj/structure/closet/secure_closet/personal/initialize()
/obj/structure/closet/secure_closet/personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack
else
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
/obj/item/clothing/shoes/boots/winter/science)
/obj/structure/closet/secure_closet/scientist/initialize()
/obj/structure/closet/secure_closet/scientist/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+7 -7
View File
@@ -119,7 +119,7 @@
/obj/item/device/flashlight/maglight,
/obj/item/clothing/mask/gas/half)
/obj/structure/closet/secure_closet/hos/initialize()
/obj/structure/closet/secure_closet/hos/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -168,7 +168,7 @@
/obj/item/device/megaphone,
/obj/item/clothing/mask/gas/half)
/obj/structure/closet/secure_closet/warden/initialize()
/obj/structure/closet/secure_closet/warden/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -212,7 +212,7 @@
/obj/item/clothing/shoes/boots/winter/security,
/obj/item/device/flashlight/maglight)
/obj/structure/closet/secure_closet/security/initialize()
/obj/structure/closet/secure_closet/security/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -221,22 +221,22 @@
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec
return ..()
/obj/structure/closet/secure_closet/security/cargo/initialize()
/obj/structure/closet/secure_closet/security/cargo/Initialize()
starts_with += /obj/item/clothing/accessory/armband/cargo
starts_with += /obj/item/device/encryptionkey/headset_cargo
return ..()
/obj/structure/closet/secure_closet/security/engine/initialize()
/obj/structure/closet/secure_closet/security/engine/Initialize()
starts_with += /obj/item/clothing/accessory/armband/engine
starts_with += /obj/item/device/encryptionkey/headset_eng
return ..()
/obj/structure/closet/secure_closet/security/science/initialize()
/obj/structure/closet/secure_closet/security/science/Initialize()
starts_with += /obj/item/clothing/accessory/armband/science
starts_with += /obj/item/device/encryptionkey/headset_sci
return ..()
/obj/structure/closet/secure_closet/security/med/initialize()
/obj/structure/closet/secure_closet/security/med/Initialize()
starts_with += /obj/item/clothing/accessory/armband/medblue
starts_with += /obj/item/device/encryptionkey/headset_med
return ..()
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2 -2
View File
@@ -48,7 +48,7 @@
/obj/structure/closet/syndicate/resources
desc = "An old, dusty locker."
/obj/structure/closet/syndicate/resources/initialize()
/obj/structure/closet/syndicate/resources/Initialize()
. = ..()
if(!contents.len)
var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
@@ -103,7 +103,7 @@
/obj/structure/closet/syndicate/resources/everything
desc = "It's an emergency storage closet for repairs."
/obj/structure/closet/syndicate/resources/everything/initialize()
/obj/structure/closet/syndicate/resources/everything/Initialize()
var/list/resources = list(
/obj/item/stack/material/steel,
/obj/item/stack/material/glass,
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+2 -2
View File
@@ -19,7 +19,7 @@
icon_closed = "emergency"
icon_opened = "emergencyopen"
/obj/structure/closet/emcloset/initialize()
/obj/structure/closet/emcloset/Initialize()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
if ("small")
starts_with = list(
@@ -106,7 +106,7 @@
icon_closed = "toolcloset"
icon_opened = "toolclosetopen"
/obj/structure/closet/toolcloset/initialize()
/obj/structure/closet/toolcloset/Initialize()
starts_with = list()
if(prob(40))
starts_with += /obj/item/clothing/suit/storage/hazardvest
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+4 -4
View File
@@ -22,7 +22,7 @@
/obj/item/clothing/accessory/armband = 3,
/obj/item/clothing/accessory/holster/waist = 3)
/obj/structure/closet/wardrobe/red/initialize()
/obj/structure/closet/wardrobe/red/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/security
else
@@ -223,7 +223,7 @@
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/science_white/initialize()
/obj/structure/closet/wardrobe/science_white/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
@@ -249,7 +249,7 @@
/obj/item/weapon/storage/backpack/toxins,
/obj/item/weapon/storage/backpack/satchel/tox)
/obj/structure/closet/wardrobe/robotics_black/initialize()
/obj/structure/closet/wardrobe/robotics_black/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
else
@@ -401,7 +401,7 @@
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/pants/camo)
/obj/structure/closet/wardrobe/tactical/initialize()
/obj/structure/closet/wardrobe/tactical/Initialize()
if(prob(25))
starts_with += /obj/item/weapon/storage/belt/security/tactical/bandolier
else
code/game/objects/structures/crates_lockers/largecrate.dm
+2 -2
View File
@@ -6,7 +6,7 @@
density = 1
var/list/starts_with
/obj/structure/largecrate/initialize()
/obj/structure/largecrate/Initialize()
. = ..()
if(starts_with)
create_objects_in_loc(src, starts_with)
@@ -63,7 +63,7 @@
desc = "It comes in a box for the consumer's sake. ..How is this lighter?"
icon_state = "vehiclecrate"
/obj/structure/largecrate/vehicle/initialize()
/obj/structure/largecrate/vehicle/Initialize()
..()
spawn(1)
for(var/obj/O in contents)
code/game/objects/structures/crates_lockers/vehiclecage.dm
+1 -1
View File
@@ -13,7 +13,7 @@
if(my_vehicle)
to_chat(user, "<span class='notice'>It seems to contain \the [my_vehicle].</span>")
/obj/structure/vehiclecage/initialize()
/obj/structure/vehiclecage/Initialize()
. = ..()
if(my_vehicle_type)
my_vehicle = new my_vehicle_type(src)
code/game/objects/structures/flora.dm
+2 -2
View File
@@ -304,7 +304,7 @@
light_power = 0.6
light_color = "#FF6633"
/obj/structure/flora/sif/subterranean/initialize()
/obj/structure/flora/sif/subterranean/Initialize()
icon_state = "[initial(icon_state)][rand(1,2)]"
. = ..()
@@ -313,6 +313,6 @@
desc = "This is a mysterious looking plant. They kind of look like eyeballs. Creepy."
icon_state = "eyeplant"
/obj/structure/flora/sif/eyes/initialize()
/obj/structure/flora/sif/eyes/Initialize()
icon_state = "[initial(icon_state)][rand(1,3)]"
. = ..()
code/game/objects/structures/ghost_pods/ghost_pods.dm
+1 -1
View File
@@ -59,7 +59,7 @@
var/delay_to_self_open = 10 MINUTES // How long to wait for first attempt. Note that the timer by default starts when the pod is created.
var/delay_to_try_again = 20 MINUTES // How long to wait if first attempt fails. Set to 0 to never try again.
/obj/structure/ghost_pod/automatic/initialize()
/obj/structure/ghost_pod/automatic/Initialize()
. = ..()
spawn(delay_to_self_open)
if(src)
code/game/objects/structures/holoplant.dm
+2 -2
View File
@@ -17,7 +17,7 @@
"plant-13"
)
/obj/machinery/holoplant/initialize()
/obj/machinery/holoplant/Initialize()
. = ..()
activate()
@@ -101,5 +101,5 @@
/obj/machinery/holoplant/shipped
anchored = FALSE
/obj/machinery/holoplant/shipped/initialize()
/obj/machinery/holoplant/shipped/Initialize()
. = ..()
code/game/objects/structures/lattice.dm
+1 -1
View File
@@ -9,7 +9,7 @@
plane = PLATING_PLANE
// flags = CONDUCT
/obj/structure/lattice/initialize()
/obj/structure/lattice/Initialize()
. = ..()
if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
code/game/objects/structures/loot_piles.dm
+1 -1
View File
@@ -115,7 +115,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
var/path = pick(rare_loot)
return new path(src)
/obj/structure/loot_pile/initialize()
/obj/structure/loot_pile/Initialize()
if(icon_states_to_use && icon_states_to_use.len)
icon_state = pick(icon_states_to_use)
. = ..()
code/game/objects/structures/noticeboard.dm
+1 -1
View File
@@ -19,7 +19,7 @@
update_icon()
return
/obj/structure/noticeboard/initialize()
/obj/structure/noticeboard/Initialize()
for(var/obj/item/I in loc)
if(notices > 4) break
if(istype(I, /obj/item/weapon/paper))
code/game/objects/structures/props/alien_props.dm
+1 -1
View File
@@ -59,7 +59,7 @@
var/static/list/possible_states = list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral", "gland")
var/static/list/possible_tech = list(TECH_MATERIAL, TECH_ENGINEERING, TECH_PHORON, TECH_POWER, TECH_BIO, TECH_COMBAT, TECH_MAGNET, TECH_DATA)
/obj/item/prop/alien/junk/initialize()
/obj/item/prop/alien/junk/Initialize()
. = ..()
icon_state = pick(possible_states)
var/list/techs = possible_tech.Copy()
code/game/objects/structures/props/beam_prism.dm
+2 -2
View File
@@ -26,7 +26,7 @@
interaction_message = "<span class='notice'>The prismatic turret seems to be able to rotate.</span>"
/obj/structure/prop/prism/initialize()
/obj/structure/prop/prism/Initialize()
if(degrees_from_north)
animate(src, transform = turn(NORTH, degrees_from_north), time = 3)
@@ -196,7 +196,7 @@
for(var/obj/structure/prop/prism/P in my_turrets)
P.rotate_auto(new_bearing)
/obj/structure/prop/prismcontrol/initialize()
/obj/structure/prop/prismcontrol/Initialize()
..()
if(my_turrets.len) //Preset controls.
for(var/obj/structure/prop/prism/P in my_turrets)
code/game/objects/structures/props/nest.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/tally = 0 //The counter referenced against total_creature_max, or just to see how many mobs it has spawned.
var/total_creature_max //If set, it can spawn this many creatures, total, ever.
/obj/structure/prop/nest/initialize()
/obj/structure/prop/nest/Initialize()
..()
den_mobs = list()
START_PROCESSING(SSobj, src)
code/game/objects/structures/props/puzzledoor.dm
+1 -1
View File
@@ -31,7 +31,7 @@
visible_message("<span class='cult'>\The [src] is completely unaffected by the blast.</span>")
return
/obj/machinery/door/blast/puzzle/initialize()
/obj/machinery/door/blast/puzzle/Initialize()
. = ..()
implicit_material = get_material_by_name("dungeonium")
if(locks.len)
code/game/objects/structures/railing.dm
+1 -1
View File
@@ -23,7 +23,7 @@
if(climbable)
verbs += /obj/structure/proc/climb_on
/obj/structure/railing/initialize()
/obj/structure/railing/Initialize()
. = ..()
if(src.anchored)
update_icon(0)
code/game/objects/structures/safe.dm
+2 -2
View File
@@ -30,7 +30,7 @@ FLOOR SAFES
tumbler_2_open = rand(0, 72)
/obj/structure/safe/initialize()
/obj/structure/safe/Initialize()
. = ..()
for(var/obj/item/I in loc)
if(space >= maxspace)
@@ -175,7 +175,7 @@ obj/structure/safe/ex_act(severity)
plane = TURF_PLANE
layer = ABOVE_UTILITY
/obj/structure/safe/floor/initialize()
/obj/structure/safe/floor/Initialize()
. = ..()
var/turf/T = loc
if(istype(T) && !T.is_plating())
code/game/objects/structures/window_spawner.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/obj/effect/wingrille_spawn/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
return FALSE
/obj/effect/wingrille_spawn/initialize()
/obj/effect/wingrille_spawn/Initialize()
. = ..()
if(!win_path)
return