shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

things with stuff (#6233)

Browse Source 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
This commit is contained in:
Poojawa
2018-04-02 03:53:25 -05:00
committed by deathride58
parent 832939d3ac
commit 5fa001c10f
838 changed files with 25446 additions and 23273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandoned_crates.dm
+2 -1
View File
@@ -150,6 +150,7 @@
if(100)
new /obj/item/clothing/head/bearpelt(src)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/closet/crate/secure/loot/attack_hand(mob/user)
if(locked)
to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
@@ -182,7 +183,7 @@
/obj/structure/closet/crate/secure/loot/AltClick(mob/living/user)
if(!user.canUseTopic(src, BE_CLOSE))
return
attack_hand(user) //this helps you not blow up so easily by overriding unlocking which results in an immediate boom.
return attack_hand(user) //this helps you not blow up so easily by overriding unlocking which results in an immediate boom.
/obj/structure/closet/crate/secure/loot/attackby(obj/item/W, mob/user)
if(locked)
code/modules/mining/aux_base.dm
+5 -5
View File
@@ -31,11 +31,8 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
. = ..()
locator = new(src)
/obj/machinery/computer/auxillary_base/attack_hand(mob/user)
if(..(user))
return
add_fingerprint(usr)
/obj/machinery/computer/auxillary_base/ui_interact(mob/user)
. = ..()
var/list/options = params2list(possible_destinations)
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
var/dat = "[is_station_level(z) ? "Docking clamps engaged. Standing by." : "Mining Shuttle Uplink: [M ? M.getStatusText() : "*OFFLINE*"]"]<br>"
@@ -280,6 +277,9 @@ obj/docking_port/stationary/public_mining_dock
var/console_range = 15 //Wifi range of the beacon to find the aux base console
/obj/structure/mining_shuttle_beacon/attack_hand(mob/user)
. = ..()
if(.)
return
if(anchored)
to_chat(user, "<span class='warning'>Landing zone already set.</span>")
return
code/modules/mining/equipment/marker_beacons.dm
+3
View File
@@ -103,6 +103,9 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color])
/obj/structure/marker_beacon/attack_hand(mob/living/user)
. = ..()
if(.)
return
to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
if(do_after(user, remove_speed, target = src))
var/obj/item/stack/marker_beacon/M = new(loc)
code/modules/mining/equipment/resonator.dm
+1 -1
View File
@@ -42,7 +42,7 @@
new /obj/effect/temp_visual/resonance(T, user, src, burst_time)
user.changeNext_move(CLICK_CD_MELEE)
/obj/item/resonator/pre_attackby(atom/target, mob/user, params)
/obj/item/resonator/pre_attack(atom/target, mob/user, params)
if(check_allowed_items(target, 1))
CreateResonance(target, user)
return TRUE
code/modules/mining/equipment/survival_pod.dm
+3
View File
@@ -150,6 +150,9 @@
return TRUE
/obj/item/device/gps/computer/attack_hand(mob/user)
. = ..()
if(.)
return
attack_self(user)
//Bed
code/modules/mining/laborcamp/laborstacker.dm
+3
View File
@@ -150,6 +150,9 @@
anchored = TRUE
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
. = ..()
if(.)
return
user.examinate(src)
/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
code/modules/mining/lavaland/ash_flora.dm
+3 -2
View File
@@ -63,12 +63,13 @@
return ..()
/obj/structure/flora/ash/attack_hand(mob/user)
. = ..()
if(.)
return
if(!harvested && !needs_sharp_harvest)
user.visible_message("<span class='notice'>[user] starts to harvest from [src].</span>","<span class='notice'>You begin to harvest from [src].</span>")
if(do_after(user, harvest_time, target = src))
harvest(user)
else
..()
/obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things
regrowth_time_low = 4200
code/modules/mining/lavaland/ruins/gym.dm
+14 -3
View File
@@ -8,10 +8,15 @@
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
/obj/structure/punching_bag/attack_hand(mob/living/user)
/obj/structure/punching_bag/attack_hand(mob/user as mob)
. = ..()
if(.)
return
flick("[icon_state]2", src)
playsound(src.loc, pick(src.hit_sounds), 25, 1, -1)
user.apply_status_effect(STATUS_EFFECT_EXERCISED)
playsound(loc, pick(hit_sounds), 25, 1, -1)
if(isliving(user))
var/mob/living/L = user
L.apply_status_effect(STATUS_EFFECT_EXERCISED)
/obj/structure/stacklifter
name = "Weight Machine"
@@ -22,6 +27,9 @@
anchored = TRUE
/obj/structure/stacklifter/attack_hand(mob/living/user)
. = ..()
if(.)
return
if(obj_flags & IN_USE)
to_chat(user, "It's already in use - wait a bit.")
return
@@ -61,6 +69,9 @@
anchored = TRUE
/obj/structure/weightlifter/attack_hand(mob/living/user)
. = ..()
if(.)
return
if(obj_flags & IN_USE)
to_chat(user, "It's already in use - wait a bit.")
return
code/modules/mining/machine_processing.dm
+2 -2
View File
@@ -30,8 +30,8 @@
else
return INITIALIZE_HINT_QDEL
/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
/obj/machinery/mineral/processing_unit_console/ui_interact(mob/user)
. = ..()
if(!machine)
return
code/modules/mining/machine_redemption.dm
+1 -5
View File
@@ -13,6 +13,7 @@
req_access = list(ACCESS_MINERAL_STOREROOM)
speed_process = TRUE
circuit = /obj/item/circuitboard/machine/ore_redemption
layer = BELOW_OBJ_LAYER
var/req_access_reclaim = ACCESS_MINING_STATION
var/obj/item/card/id/inserted_id
var/points = 0
@@ -189,11 +190,6 @@
materials.retrieve_all()
..()
/obj/machinery/mineral/ore_redemption/attack_hand(mob/user)
if(..())
return
interact(user)
/obj/machinery/mineral/ore_redemption/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
code/modules/mining/machine_stacking.dm
+2 -4
View File
@@ -19,8 +19,8 @@
else
qdel(src)
/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
/obj/machinery/mineral/stacking_unit_console/ui_interact(mob/user)
. = ..()
var/obj/item/stack/sheet/s
var/dat
@@ -35,8 +35,6 @@
user << browse(dat, "window=console_stacking_machine")
return
/obj/machinery/mineral/stacking_unit_console/Topic(href, href_list)
if(..())
return
code/modules/mining/machine_vending.dm
+3 -9
View File
@@ -80,14 +80,9 @@
icon_state = initial(icon_state)
else
icon_state = "[initial(icon_state)]-off"
return
/obj/machinery/mineral/equipment_vendor/attack_hand(mob/user)
if(..())
return
interact(user)
/obj/machinery/mineral/equipment_vendor/interact(mob/user)
/obj/machinery/mineral/equipment_vendor/ui_interact(mob/user)
. = ..()
var/dat
dat +="<div class='statusDisplay'>"
if(istype(inserted_id))
@@ -283,8 +278,7 @@
name = "mining conscription kit"
desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
/obj/item/storage/backpack/duffelbag/mining_conscript/Initialize()
. = ..()
/obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents()
new /obj/item/pickaxe/mini(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src)
code/modules/mining/mine_items.dm
+2 -1
View File
@@ -74,12 +74,13 @@
no_destination_swap = 1
var/global/list/dumb_rev_heads = list()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
if(is_station_level(user.z) && user.mind && is_head_revolutionary(user) && !(user.mind in dumb_rev_heads))
to_chat(user, "<span class='warning'>You get a feeling that leaving the station might be a REALLY dumb idea...</span>")
dumb_rev_heads += user.mind
return
..()
. = ..()
/**********************Mining car (Crate like thing, not the rail car)**************************/
code/modules/mining/minebot.dm
+5 -3
View File
@@ -115,6 +115,9 @@
..()
/mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M)
. = ..()
if(.)
return
if(M.a_intent == INTENT_HELP)
toggle_mode()
switch(mode)
@@ -123,7 +126,6 @@
if(MINEDRONE_ATTACK)
to_chat(M, "<span class='info'>[src] has been set to attack hostile wildlife.</span>")
return
..()
/mob/living/simple_animal/hostile/mining_drone/CanPass(atom/movable/O)
if(istype(O, /obj/item/projectile/kinetic))
@@ -139,7 +141,7 @@
/mob/living/simple_animal/hostile/mining_drone/proc/SetCollectBehavior()
mode = MINEDRONE_COLLECT
idle_vision_range = 9
vision_range = 9
search_objects = 2
wander = TRUE
ranged = FALSE
@@ -150,7 +152,7 @@
/mob/living/simple_animal/hostile/mining_drone/proc/SetOffenseBehavior()
mode = MINEDRONE_ATTACK
idle_vision_range = 7
vision_range = 7
search_objects = 0
wander = FALSE
ranged = TRUE
code/modules/mining/mint.dm
+3
View File
@@ -28,6 +28,9 @@
materials.insert_stack(O, O.amount)
/obj/machinery/mineral/mint/attack_hand(mob/user)
. = ..()
if(.)
return
var/dat = "<b>Coin Press</b><br>"
GET_COMPONENT(materials, /datum/component/material_container)
code/modules/mining/satchel_ore_boxdm.dm
+3
View File
@@ -34,6 +34,9 @@
. = ..()
/obj/structure/ore_box/attack_hand(mob/user)
. = ..()
if(.)
return
if(Adjacent(user))
show_contents(user)