Skip to content

Commit

Permalink
refresh
Browse files Browse the repository at this point in the history
  • Loading branch information
Derven committed Apr 6, 2020
1 parent f642b42 commit f11ceee
Show file tree
Hide file tree
Showing 16 changed files with 561 additions and 444 deletions.
6 changes: 3 additions & 3 deletions CODE/MACHINERY_rework/STATIONARY/airlocks/med.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/machinery/airlock
///obj/machinery/airlock

med
icon = 'airlock_med.dmi'
// med
// icon = 'airlock_med.dmi'
4 changes: 4 additions & 0 deletions CODE/MACHINERY_rework/STATIONARY/gravity.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ var/list/accessable_z_levels = list(1, 2)
use_power = 1
idle_power_usage = 200
active_power_usage = 1000
plane = 80
bound_height = 200
bound_width = 120

var/on = 1
var/list/localareas = list()
var/effectiverange = 25
Expand Down
2 changes: 1 addition & 1 deletion CODE/MACHINERY_rework/STATIONARY/smelter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

attackby(obj/item/weapon/W as obj, mob/simulated/living/humanoid/user as mob)
if(istype(W, /obj/item/stack/metalore))
usr << "You smelt the ore..."
usr << "You smelt the ore..." ///hhmmm
if(do_after(usr, 5))
user.drop_item_v()
del(W)
Expand Down
7 changes: 4 additions & 3 deletions CODE/MACHINERY_rework/STATIONARY/supertelepad.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@


/////rework this shit please
/*
/obj/machinery/supertelepad
name = "advanced teleporter pad"
icon = 'stationobjs.dmi'
Expand All @@ -22,4 +22,5 @@
attack_hand()
if(usr.do_after(10))
sell()
sell()
*/
6 changes: 0 additions & 6 deletions CODE/MOB_SIMULATED_LIVING.dm
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
/mob/simulated/living/proc/attacked_by(var/obj/item/I, var/mob/simulated/living/humanoid/user, var/def_zone)
user = usr
var/mob/simulated/living/humanoid/H = src
world << "debug0"

var/staminamodify = 0
if(istype(usr, /mob/simulated/living/humanoid))
Expand All @@ -286,7 +285,6 @@
if(USRH.stamina < 30)
staminamodify = rand(2,3)

world << "debug11"

if((!I || !user) && istype(I, /obj/item/weapon/reagent_containers)) return 0

Expand All @@ -302,13 +300,10 @@
M.playsoundforme('handcuffs.ogg')
return

world << "debug12"

var/datum/organ/external/defen_zone
if(client)
defen_zone = get_organ(ran_zone(DF_ZONE.selecting))

world << "debug13"

var/datum/organ/external/affecting = get_organ(ran_zone(user.ZN_SEL.selecting))
var/hit_area
Expand All @@ -322,7 +317,6 @@
def_area = pick("chest", "head")


world << "debug1"
usr << "\red <B>[src] attacked [user] to [hit_area] by [I.name] !</B>"

if(istype(I, /obj/item/weapon/flasher))
Expand Down
1 change: 1 addition & 0 deletions CODE/TURFS/SIMULATED/WALLS/new_wall.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var/w = "w"
icon_state = "w"
walltype = "w"
layer = 1

proc/check_airlock(var/turf/iloc)
if(locate(/obj/machinery/airlock, iloc))
Expand Down
Binary file modified ICONS/firedoor.dmi
Binary file not shown.
355 changes: 229 additions & 126 deletions MAPS/backup/metatest.dmm

Large diffs are not rendered by default.

514 changes: 256 additions & 258 deletions MAPS/lunamapsave.dmm

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions MAPS/metatest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,6 @@
"sh" = (/obj/structure/table,/obj/item/weapon/crowbar,/turf/simulated/floor,/area/ship/deck_1)
"si" = (/obj/structure/table,/turf/simulated/floor{icon_state = "darkgray"},/area/ship/deck_1)
"sj" = (/turf/space{icon_state = "10"; color = "#443900"},/area/ship/deck_1)
"sk" = (/obj/machinery/supertelepad,/turf/simulated/floor,/area/ship/deck_1)
"sl" = (/obj/structure/table,/obj/machinery/consol{icon_state = "consol"; dir = 8},/turf/simulated/floor/red,/area/ship/deck_1)
"sm" = (/obj/structure/sign{icon_state = "high_voltage"},/turf/simulated/wall/newicon{icon_state = "w_ew"; maptext_width = 32; maptext_height = 32},/area/ship/deck_1)
"sn" = (/obj/machinery/airlock/glassairlock{icon_state = "close"; dir = 8},/turf/simulated/floor{icon_state = "darkgray"},/area/ship/deck_1)
Expand Down Expand Up @@ -1955,7 +1954,7 @@ abbvanbUcnbrbcckbtaAanaYbgambDbjbTbzbwaBabceaCaWanbgclbxcbayaEfdenczdSiDHuiuhsiD
bwafaDbQceapbNaYaIbWadaebGbBbjbRaWcqblceaqcfbxbVbMblafafaAaZapejdecKdSjgmujgjgiDlXHuHuHuHuhLhLhLhLHuHuhJhLhLjzdfcNfHaHbSdFdxeljqlsrfpVqHHuHuHuHuHuHuHuxxhJpIpIpIrThJcviuhmHuHuHuHuHuHuHueNeRoRkriWhLhLrUkpkroUdLdQcwcwcwlhjxlfrKrKjFrKrKrKjFkJHueXHuHuHugHHuHueXeXHuHueXHuidcwlMcwcwiJeHmEmFrVHurWgHHuhJkHhLimhLhLhLrXHuHuHuHuklozrYoAoAjgoAoArYoAoAosmTijijijijijijijdJdFcKdscVbSbMbRbcapbYbTaDasbMbdaRbBbuagbvaEeSfwfCgfeZhhgagzeVgTfOfOgzeVgTfOfOgzeVgTgahheZgffweBcBbUaUcbbLbFaMbUbxcnbkbTctaCbPajaTcuaqbFbRaGbjbNbmbuaVaN
bDakaibwbfasaqabbgbCbBbmcuciaobAataAaFcnbdaeaFbMbDbxbUcnbdarbmcFgWcHdQhLhLhLkHhJHuHuHultljHuHuHuhLHuHuhJhLkHeNfIeCcQbIbDcRfEejfwdZBrpVqHkwllllllrZHuHuHuiuhohoiBhoiDcvigHuHuHuHuHuHuHuHuhJdzdshlkjiBrchodGfecAfHhCcwcwcwBJjxjxjFjFjFjFjFjFjFgHJdHuHuHuHurMHuHuHuHuHuHuHuHuHucwcwcwcwcwdUexexhojJhojghojghohLhJhLhLhLhJHuHuHuHuHuHuHuHuHuHuhLhLeNsbfEczdNatbCciagbPbgacfLcMetdkfsblccbZbfcjaocdaJcvaybYctaUbvcmawaJgWejdagfeZgcfjdrdQfLgdfFcSeofAetdFfFdQeafsgceZgffrddficgbYalaSbNbbbVbbaxaXbwbMauaKapaibBaQcdaHbjcicrabaIaecg
arcqbwalaYaMblbTcraJaubvbDbIcscobccabqbTbobpclclbpaNbTbfbVbZbseRcOfugrhqhojJiBjghojJiBhoivixhohoiBjJiBjgjJhomcdmdbcLdedZcNdLeietcRdQpVqHHuHuHuHuHuHuHuHuhJscsdpupuhJcvhJseljsfHusgshHuHukjkreLroiyrUrUrUkjroeLkrhjmumumujghohohojdsijFjFjFsihJHuHuHuHujbjgiBhohshojdpNpNpNHulPlPeHlPlPeHzFcvhLhLhLhLhLhLhLhLiuiBhohoiDkKHuHuHuHuHuhJHuHuHujbholAsjdAfvcvcvcvcvcvcvcvcvfvfDcGfqdNaPctbBbrbEbzbXcfcaaUbfbtbGazajbebqeEdIemgfeZgzcJdmdSeVfYfYeVeVeVfYfYeVgMfucMgTeZgfgddLfjaLbwajaqbrbhbXbcatccbcaIbQafbUbwaSaOadbaaeaFaDbebjbTbu
bwaEbZaTbkbubVbzbNcpbwbxbZahauaqavbNacadcsalbWbWbEbTaCbgbfbObFcNcHdWdmjzkIHuHuHvHuHuHuHvHuHuJcHvHuHuHuHvHuHueNdscAdKdkcSdNfMdRdzcAdQpVqHHuskHukwllHuHuHupXpuHuHuslhJhLklhohsiviwixhoiCiClymfmfHuklhowWhokNHuHuHuHvHuHuHuHuHuHvHuklhohmsnhmhojghmiCiChmkNsoHuHvigJykliBhohojJexexqxexexgGcvcvhLjbhohohoiBhohoiDspspsqklhmsrhshomuiBiDHuHuHunLhLnMmmmmmnhLhLhLhLhLhLhLhLhLeNftejeiagaXcgalajaCbhbEbBbqarbpbGalbWaMeneicFfegfeZeVdDfYegeAeeeeeeeeeeeeeeeAegfYdDeVeZgfejfqetcbaHagagcpblcnbVaCbocubmakbaaibYaObIbeaDbHbYaBadbMajay
bwaEbZaTbkbubVbzbNcpbwbxbZahauaqavbNacadcsalbWbWbEbTaCbgbfbObFcNcHdWdmjzkIHuHuHvHuHuHuHvHuHuJcHvHuHuHuHvHuHueNdscAdKdkcSdNfMdRdzcAdQpVqHHuHuHukwllHuHuHupXpuHuHuslhJhLklhohsiviwixhoiCiClymfmfHuklhowWhokNHuHuHuHvHuHuHuHuHuHvHuklhohmsnhmhojghmiCiChmkNsoHuHvigJykliBhohojJexexqxexexgGcvcvhLjbhohohoiBhohoiDspspsqklhmsrhshomuiBiDHuHuHunLhLnMmmmmmnhLhLhLhLhLhLhLhLhLeNftejeiagaXcgalajaCbhbEbBbqarbpbGalbWaMeneicFfegfeZeVdDfYegeAeeeeeeeeeeeeeeeAegfYdDeVeZgfejfqetcbaHagagcpblcnbVaCbocubmakbaaibYaObIbeaDbHbYaBadbMajay
bwbfbCbLbjcsbsbgbdascpacbubDaBbjbcbcaJaXblalabbmbQabaBbybmbsaRfldwcHeTssHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHugOdYdhfzdxdkdReifegqdJeokIqHHuHuHullkwHuHuHuhJpYstsuslhJhLhLhLigHuHuHuHvHuHuHuHuHuHuHuHvHuHvHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHvHuHuHuHuHuHuHuHuhJhLhLhLlShLhLhLhLhLhLlShLHPhLhLimjpjpsvjpswsximjFjFjFjFjFjFhJngHungiuhohohoiDhLhJhLhLhLhLhLjbhojdhLhLhLhLeNeRejfFaPbGbmaxbwaxbpaucaagazafawaubNcZfGcWfFcEgfeZhfemgeeAgGcwcwcwcwcwcwcwgxeAdVfAgTeZgfekgqgqdYbbcsaacsaObabDcubqagaRbraXawcjaKbZaHcabzaUbrcraTbAcg
beavbIbybXbCaHasbFaPbNaxaFaYbRaqcacbaQaVaQaVbabMaKaXacbxavaSaDcTemfQdFmSkkeFkkkrmNhrjdHuHuHuHukphrjVHuHuHuHukjkreFeFiYiZjakQeFeFkriyHuqHHuHuHuHuHuHuHuHuiuiBhohshmjghojJhoiDHuHuHuHuHuHuHuHutsHuHuHuHuHuHutsHuHuHutsHuHuHuHutsHuHuHutsHuHuHuHutsHuHuHuHuHuHuHuiuiBhojJhohohshojJjdhLkpkkhqiBhoiDlTjFjFjFjFsyhJjFszsAsBsCjFhJkIHuHuhJqKsDlEiuozjghohohohohokNhLklhohohshomccDdAelaKbMbrbGbaccaGclcuaMaiaNeieEeEeldPhlcHdFgceZgfdAdSdTcwcwcweOfmePcwcwcwdUgMfKgfeZgffkfLcNdNadbzaqaNbAblbEbhbsbLbSaGawcjbKbPaeboaMasbUawcjbXcmag
bFbHbVbpbDavbaapbobUbLcecmbVbXbdcebBavcpafbyapaWaQbKbFckchazbDcmdjfwdpoSeufydkddhJhLjzlnHuHuHujzhLsEhojVHuHuighLhLlShLhLhLhLlShLhLigHusFlgljHusGsGjbmbmbhysHsIhJsJsKpfHurDimHuHutsHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHuHutsHuHuhJsgHvHungnghJsLhLhJhLgOsMgOjpjEiujFjpjpjpjFsNhJlTkysOsOsPjFimHuHuHuhJkIHusQhJhLhLhLhLhLhLhLhLhLhLhLhLighLqUcFhlcQbGaSauaTaxaiaxbtcobicoaHdbcJfefcfofqcyfNhheZgzdagedTeGeQexdTcwdUexeQeGdUdVdIgTeZgcdXeScPdabucobhcnaCaIbObKbobHacbPagayacbIaFbUaSbTatbbaqaXaNcc
Expand Down
Loading

0 comments on commit f11ceee

Please sign in to comment.