From aeb1f5ae689379872b246e5817fcd8fb254bdc30 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 14 May 2015 01:39:49 -0400 Subject: [PATCH 1/8] Updates instances of if(cell.use(...)) --- code/game/machinery/rechargestation.dm | 3 ++- code/game/objects/items/weapons/stunbaton.dm | 3 ++- code/modules/mob/living/silicon/robot/robot.dm | 6 ++++-- code/modules/projectiles/guns/energy.dm | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 22612983a8..db7b9d0e45 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -167,7 +167,8 @@ return if(!R.cell.fully_charged()) var/diff = min(R.cell.maxcharge - R.cell.charge, charge_rate) // Capped at charge_rate charge / tick - if (cell.use(diff)) + if (cell.charge >= diff) + cell.use(diff) R.cell.give(diff) if(weld_rate && R.getBruteLoss()) R.adjustBruteLoss(-1) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 62890d849c..ca495ee263 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -35,7 +35,8 @@ /obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt) if(bcell) - if(bcell.use(chrgdeductamt)) + if(bcell.charge >= chrgdeductamt) + bcell.use(chrgdeductamt) return 1 else status = 0 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b762ec79c1..71171212a2 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1233,8 +1233,10 @@ var/list/robot_verbs_default = list( if(cell.charge == 0) return 0 - if(cell.use(amount * CELLRATE * CYBORG_POWER_USAGE_MULTIPLIER)) - used_power_this_tick += amount * CYBORG_POWER_USAGE_MULTIPLIER + var/power_use = amount * CYBORG_POWER_USAGE_MULTIPLIER + if(cell.charge >= CELLRATE * power_use) + cell.use(CELLRATE * power_use) + used_power_this_tick += power_use return 1 return 0 diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 994256b12a..f85f41276f 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -57,7 +57,7 @@ /obj/item/weapon/gun/energy/consume_next_projectile() if(!power_supply) return null if(!ispath(projectile_type)) return null - if(!power_supply.use(charge_cost)) return null + if(power_supply.charge < charge_cost || !power_supply.use(charge_cost)) return null return new projectile_type(src) /obj/item/weapon/gun/energy/proc/get_external_power_supply() From defc4c1f94108e2cd9e99cfac5ca5a890a280793 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 18 May 2015 20:09:09 -0400 Subject: [PATCH 2/8] Adds check_charge(), checked_use() --- .../game/objects/items/weapons/power_cells.dm | 5 +++- code/game/objects/items/weapons/stunbaton.dm | 4 +-- .../modules/mob/living/silicon/robot/robot.dm | 3 +-- code/modules/power/cell.dm | 27 ++++++++++++++----- code/modules/power/power.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 5cab6b24cb..bd344d2267 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -88,8 +88,11 @@ name = "infinite-capacity power cell!" icon_state = "icell" origin_tech = null - maxcharge = 30000 + maxcharge = 30000 //determines how badly mobs get shocked matter = list("metal" = 700, "glass" = 80) + + check_charge() + return 1 use() return 1 diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index ca495ee263..811cd4f866 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -35,13 +35,13 @@ /obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt) if(bcell) - if(bcell.charge >= chrgdeductamt) - bcell.use(chrgdeductamt) + if(bcell.checked_use(chrgdeductamt)) return 1 else status = 0 update_icon() return 0 + return null /obj/item/weapon/melee/baton/update_icon() if(status) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 71171212a2..542daeed5f 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1234,8 +1234,7 @@ var/list/robot_verbs_default = list( return 0 var/power_use = amount * CYBORG_POWER_USAGE_MULTIPLIER - if(cell.charge >= CELLRATE * power_use) - cell.use(CELLRATE * power_use) + if(cell.checked_use(CELLRATE * power_use)) used_power_this_tick += power_use return 1 return 0 diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 553891565c..f664890be9 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -9,7 +9,7 @@ spawn(5) updateicon() -/obj/item/weapon/cell/drain_power(var/drain_check, var/surge, var/amount = 0) +/obj/item/weapon/cell/drain_power(var/drain_check, var/surge, var/power = 0) if(drain_check) return 1 @@ -17,9 +17,9 @@ if(charge <= 0) return 0 - var/cell_amt = min((amount * CELLRATE), charge) - use(cell_amt) - return cell_amt / CELLRATE + var/cell_amt = power * CELLRATE + + return use(cell_amt) / CELLRATE /obj/item/weapon/cell/proc/updateicon() overlays.Cut() @@ -37,13 +37,26 @@ /obj/item/weapon/cell/proc/fully_charged() return (charge == maxcharge) -// use power from a cell +// checks if the power cell is able to provide the specified amount of charge +/obj/item/weapon/cell/proc/check_charge(var/amount) + return (charge >= amount) + +// use power from a cell, returns the amount actually used /obj/item/weapon/cell/proc/use(var/amount) if(rigged && amount > 0) explode() return 0 - charge = max(0, charge - amount) - return charge + var/used = min(charge, amount) + charge -= used + return used + +// Checks if the specified amount can be provided. If it can, it removes the amount +// from the cell and returns 1. Otherwise does nothing and returns 0. +/obj/item/weapon/cell/proc/checked_use(var/amount) + if(!check_charge(amount)) + return 0 + use(amount) + return 1 // recharge the cell /obj/item/weapon/cell/proc/give(var/amount) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 7cfcc53246..4a172b361b 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -374,7 +374,7 @@ if (source_area) source_area.use_power(drained_energy/CELLRATE) else if (istype(power_source,/datum/powernet)) - var/drained_power = drained_energy/CELLRATE //convert from "joules" to "watts" + var/drained_power = drained_energy/CELLRATE drained_power = PN.draw_power(drained_power) else if (istype(power_source, /obj/item/weapon/cell)) cell.use(drained_energy) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f85f41276f..c167964f34 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -57,7 +57,7 @@ /obj/item/weapon/gun/energy/consume_next_projectile() if(!power_supply) return null if(!ispath(projectile_type)) return null - if(power_supply.charge < charge_cost || !power_supply.use(charge_cost)) return null + if(!power_supply.checked_use(charge_cost)) return null return new projectile_type(src) /obj/item/weapon/gun/energy/proc/get_external_power_supply() From e23f5e7e06797092ca5663949f4a66c725c5517e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 18 May 2015 20:09:31 -0400 Subject: [PATCH 3/8] Fixes hardsuit shocking --- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- code/modules/clothing/spacesuits/rig/rig_attackby.dm | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index eff23b686c..b534c861fe 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -706,7 +706,7 @@ take_hit((100/severity_class), "electrical pulse", 1) /obj/item/weapon/rig/proc/shock(mob/user) - if (electrocute_mob(user, cell, src)) + if (electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here. spark_system.start() if(user.stunned) return 1 diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index c0d119b0b4..f3f48b5661 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -3,9 +3,7 @@ if(!istype(user,/mob/living)) return 0 if(electrified != 0) - if(cell && cell.charge >= 100) - cell.use(100) - if(shock(user, 100)) + if(shock(user)) //Handles removing charge from the cell, as well. No need to do that here. return // Pass repair items on to the chestpiece. @@ -193,8 +191,6 @@ /obj/item/weapon/rig/attack_hand(var/mob/user) if(electrified != 0) - if(cell && cell.charge >= 100) - cell.use(100) - if(shock(user, 100)) + if(shock(user)) //Handles removing charge from the cell, as well. No need to do that here. return ..() \ No newline at end of file From 7cfb921ca03dae7c2266e5f8b9d9a99978570a4d Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 20 May 2015 20:36:24 +0100 Subject: [PATCH 4/8] Fixes a typo/mistake --- code/game/machinery/autolathe_datums.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index 522b58744b..aefc774f68 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -202,7 +202,7 @@ category = "Medical" /datum/autolathe/recipe/syringegun_ammo - name = "syringe" + name = "syringe gun cartridge" path = /obj/item/weapon/syringe_cartridge category = "Arms and Ammunition" From 0aff37a72ce2eae31ac75f01c9766464626f6762 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 21 May 2015 06:03:15 +0100 Subject: [PATCH 5/8] Fixes floor painter 'side/3 corners'->'black' and another state --- code/game/objects/items/devices/floor_painter.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index a1c21a7b3f..43bc58261b 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/code/game/objects/items/devices/floor_painter.dm @@ -108,7 +108,7 @@ mode_nice = design mode = "[replacetext(design, "-", "")]full" if("corner") - var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-grey", "white-red", "white-blue", "white-green", "white-yellow", "white-purple") + var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple") mode_nice = "[design] corner" mode = "[replacetext(design, "-", "")]corner" tile_dir_mode = 2 @@ -128,11 +128,13 @@ if(design == "white") mode = "whitehall" mode_nice = "white side" - tile_dir_mode = 1 + else if(design == "black") // because SOMEONE made the black/grey side/corner sprite have the same name as the 'empty space' sprite :( + mode = "blackfloor" + mode_nice = design else mode_nice = design mode = replacetext(design, "-", "") - tile_dir_mode = 1 + tile_dir_mode = 1 if("special") var/design = input("Which design?", "Floor painter") in list("arrival", "escape", "caution", "warning", "white-warning", "white-blue-green", "loadingarea", "delivery", "bot", "white-delivery", "white-bot") if(design == "white-blue-green") From 4e7702b7f32b1a10c4fe4bd028dfa864ec92d4ab Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 21 May 2015 07:11:32 +0100 Subject: [PATCH 6/8] DMI change for floor painter (renaming 'black' to 'blackfloor') --- icons/turf/floors.dmi | Bin 313410 -> 313413 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 3c2d77e20a3c4c09b503ce7b977c8f77a5dd18cd..0ea7cd38f07977f341890ae3e2f7cd10d9e9b661 100644 GIT binary patch delta 1355 zcmV-R1+@CYkQ2p_6ObeUxv?dr0e@V=c~_$@p7pAHC0#AmF=&SmuYse_Pt|o9ad4}y z+i=*H!*&qc8|QrO^#SM87yJk>*!>sm`U`gZIYAoDm9V zgv1%4afU_ioKe12R`AZ>dy#*|bG>J!4yu+4i#C8*l>x*Ox5|p?O6SXF-hb^}+hUQ% z?q1;7m%(Wq&jG|i9oqHkP-AB&mQZbEiBO2qC-Jz`EgUYzD)C};8HlAakc8|5$vjF= z5)m3m9HL0#-4{um=^}{}ULiHn{yAK(< z2OLSZ|5e_;`=R8D<&*)(NgYjqR*h4Ywzcx2pv4(mX&>IQVmVv;mT;S92x~#FXTQTiCr&L zb?~}{!VX?neDJ#VgV&wYuIqo1!F@r`;ijPHaGBq8xF6~{ViKY&ZEM^!49|;urXIv? zSkK`WaJVt6G|^NIAgeXeP@R=Ad1%BRm{$+Z&Q&?Per7OUM1M0F%P@nn6f>BRV}kJl zoWXc8%wW6)W-wlk^Pu2GKBtpnNQ?*ObW#+F6+NeM9Ale~^@t?aB9d5#NMa2liJw1` z{Il~T61;jNiI;99@wzRPF9i29B~v4mM-%#qYyye{Ik7mD6N`g6u{fL)ivv2bL_%tG z5N6(cZgdcOf`8l^_4g4+!Kl;1+gVRj*|Pm|@#iubP#I%Q*10p5OLGIvWw`<7lH34u zXVn06XVn1XrO{8d?$$Va_GCtr8=BnG^yC9=^I=US9OYXHkF?E4+Rw*? zyA#Py`BuUc?dR77l1QKZs!Ld)cWZod4Jf~uvyAsOOMh{ID76Nb-%lC8p|UN#s1;=@>ukrzV7Dep>4Cjp69wtS(t6#mi6VMpX&LUrj=-5~!d7C(pk;HL~Bo1RF@rH{e-f)q` z8!nP~!}UMhwwFJ#Udx`f*9T!=g>8-Ey7CB?DSr;<+MdY4fH}@TC+XmpIX5~;PD~UV z9V923>_!L4i7vm4ghd%{I#HNyB-g%pPkHhn?&vnUUw-FUGj?u>gUz>U*A^We*U=q4;&RLt(!gdrGw)JhvNnThvNnU NhvNnVx8nu`U%}GKqiz5I delta 1352 zcmV-O1-JUekQ2g?6ObeUwy`Co0e`6pXYrU<%ZM{ub=`); zwj8#D*xoqjYp)MDmA>Fdc){+!VAo%;+b{PRdBDgcMxHS8m5}a^U{GW_E6;_ECqsu@nm4PH=A4uj=dXk9H zK;jTZ67Rl9;!GDwobV!v^WLaDPJbiHM~O&=Bg)5#NR1=PM~X<4ste+s#t9{Yd3D6| zv^ku+lX#=>u4>*Y@5t$&@_&};t_O}CxOjKA&fqCh;oW(t!!Gb^c2kTJC8KX8bh^S- zbB`w3B{AztXRVYt7Y^>e9SVngA}9?Bxoh0nJ9pqRNb9Obg|fk&?*Otrx{;F#&UcL>Mt}8ZzJsZO*h>5GmL*@Y!B^^tY%= zs^#CC++0}v-&Mq5w0|eBx;@LUlU1?k6o?&=i+%xqcZo_&G zw}8WqS*3}lY5-ZSiH7Q|jLAbI{=mF-aCWZB+4VDn@gkbRSbv5YjHQ^tgd7u$7vK!W zi(v-iEii-ea-0VRFY-B^6hmS>FsGBENUZ2NjpG>GbgV}tu@;fUIz$p{5J~*}k>sD9 zACchI8%ex$BZ=2-p?o2@pDCFdp*)( z-gBda&=cg=sDHnYI0{Cc7GBJHn#z{#my17_$$-ijYqHLrv0R!PU@prIFqh;8m^-Tm zm^-Tm7%z=}s&%)<*|R4zn%vOjmL_*Jd7nVy^PndmXqyjfBH<|CN_eDgKGJ?ZCfuD! zcFMOBo@hV6CXht>>{ngF0=-+~lWRcv#hhiluUU!%M1QF@u>5|?_zjh9=~b0&c?q^_ z;;`#ceoJRNdR=EbJ_frrQA!W&{hBC9CzjUheoYk76HCi*za|R*iA~S}*L)*NN8*0X zo>$rZny8Q>nh>&th$RFpC0;zrMvE!rjg|R#Lwh$oc=1OP@2F9E9QhIDqeNtt5#{4V>p+?8XBFWptfs7=MVv;kLc}iS=6cti3)6`zmZ}6xWqUuuO3{*MIgz4hGC|{v}BVx6HZGL2_cE*ytcR z(PTF|NKSP5jSiCIkG$dsPjmFz>)83iuQ}RmchjV* zB_zjRNM7=|7QE!~jPH_PJWxNczW@5R`u6k3?SF%JD2pmZ8L5Nj28ZSb0f*)W0*B@X K1GnY|1Yf~eS+#Be From 77099631d1bd769940ac3b1e6a84c839b5557dc7 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Fri, 22 May 2015 08:27:12 +0200 Subject: [PATCH 7/8] Updates del usages. --- code/modules/mob/living/carbon/human/human_powers.dm | 2 +- code/modules/mob/living/carbon/resist.dm | 4 ++-- .../modules/mob/living/simple_animal/friendly/farm_animals.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 0357d4ee09..27a8f93753 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -253,6 +253,6 @@ visible_message("\The [src] quivers slightly, then splits apart with a wet slithering noise.") - del(src) + qdel(src) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index 7a4c184ca7..9a511504f3 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -118,7 +118,7 @@ say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - del(handcuffed) + qdel(handcuffed) handcuffed = null if(buckled && buckled.buckle_require_restraints) buckled.unbuckle_mob() @@ -139,7 +139,7 @@ say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - del(legcuffed) + qdel(legcuffed) legcuffed = null update_inv_legcuffed() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 1dcd98ffdc..217b1f0914 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -51,7 +51,7 @@ if(locate(/obj/machinery/portable_atmospherics/hydroponics/soil/invisible) in loc) var/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/SP = locate() in loc - del(SP) + qdel(SP) if(!pulledby) var/obj/effect/plant/food From 51231538ed7a30f9c837855d7d05abcb6e655653 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Fri, 22 May 2015 08:27:42 +0200 Subject: [PATCH 8/8] Changelog update. --- html/changelog.html | 30 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 32 +++++++++++++++++++++++ html/changelogs/Ccomp5950-Goats.yml | 7 ----- html/changelogs/Comma-PR-9337.yml | 8 ------ html/changelogs/HarpyEagle-fire.yml | 4 --- html/changelogs/Yoshax - trapping.YML | 37 --------------------------- html/changelogs/Zuhayr-materials.yml | 7 ----- 7 files changed, 62 insertions(+), 63 deletions(-) delete mode 100644 html/changelogs/Ccomp5950-Goats.yml delete mode 100644 html/changelogs/Comma-PR-9337.yml delete mode 100644 html/changelogs/HarpyEagle-fire.yml delete mode 100644 html/changelogs/Yoshax - trapping.YML delete mode 100644 html/changelogs/Zuhayr-materials.yml diff --git a/html/changelog.html b/html/changelog.html index 6cc3c3bc31..0aadb8c879 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,36 @@ -->
+

22 May 2015

+

Ccomp5950 updated:

+
    +
  • Beepsky no longer kills goats.
    • +
  • Goats will move towards vines that are 4 spaces away now instead of 1
    • +
  • Goats will eat the spawning plants for vines as well as the vines themselves.
    • +
+

Chinsky updated:

+
    +
  • Ghetto diagnosis. Grab patient, aim at bodypart you want to check, click on them with help intent. This will tell you about their wounds, fractures and other oddities (toxins/oxygen) for that bodypart.
    • +
  • Fractures are visible on very damaged limbs. Dislocations are always visible. Surgery incisions now visible too.
    • +
  • Stethoscopes actually make sense now. They care for heart/lungs status when reporting pulse and respiration now.
    • +
+

HarpyEagle updated:

+
    +
  • Re-implemented fuel fires. Tweaked fire behaviour overall.
    • +
+

Yoshax updated:

+
    +
  • Bear traps now do damage when stood on, enough to break bones! Bear traps can now affect any limb of a person who is on the ground, including head! Bear traps are no longer legcuffs and instead embed in the limb they attack.
    • +
  • Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they are deployed.
    • +
+

Zuhayr updated:

+
    +
  • Massive material refactor. Walls, beds, chairs, stools, tables, ashtrays, knives, baseball bats, axes, simple doors, barricades, so on.
    • +
  • Tables are now built via steel then another sheet on the resulting frame. They can then be reinforced by dragging a stack of sheets onto the table.
    • +
  • Walls are built with steel for girders, then right-click the girder and select the reinforce verb while holding a stack, then click the girders with a final sheet.
    • +
  • Various things can be built with various sheet types. Experiment! Just keep in mind that uranium is now radioactive and phoron is now flammable.
    • +
+

18 May 2015

Hubblenaut updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index a0bf108e0e..25b2ca7dc7 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1816,3 +1816,35 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Turf are now processed. This, for example, causes radioactive walls to regularly irradiate nearby mobs. - bugfix: Welders should now always update their icon and inhand states properly. +2015-05-22: + Ccomp5950: + - bugfix: Beepsky no longer kills goats. + - tweak: Goats will move towards vines that are 4 spaces away now instead of 1 + - bugfix: Goats will eat the spawning plants for vines as well as the vines themselves. + Chinsky: + - rscadd: Ghetto diagnosis. Grab patient, aim at bodypart you want to check, click + on them with help intent. This will tell you about their wounds, fractures and + other oddities (toxins/oxygen) for that bodypart. + - rscadd: Fractures are visible on very damaged limbs. Dislocations are always visible. + Surgery incisions now visible too. + - rscadd: Stethoscopes actually make sense now. They care for heart/lungs status + when reporting pulse and respiration now. + HarpyEagle: + - rscadd: Re-implemented fuel fires. Tweaked fire behaviour overall. + Yoshax: + - tweak: Bear traps now do damage when stood on, enough to break bones! Bear traps + can now affect any limb of a person who is on the ground, including head! Bear + traps are no longer legcuffs and instead embed in the limb they attack. + - tweak: Bear traps now take several seconds to deploy and cannot be picked up when + armed, they must be disarmed by clicking on them. They also cannot be moved + then they are deployed. + Zuhayr: + - rscadd: Massive material refactor. Walls, beds, chairs, stools, tables, ashtrays, + knives, baseball bats, axes, simple doors, barricades, so on. + - rscadd: Tables are now built via steel then another sheet on the resulting frame. + They can then be reinforced by dragging a stack of sheets onto the table. + - rscadd: Walls are built with steel for girders, then right-click the girder and + select the reinforce verb while holding a stack, then click the girders with + a final sheet. + - rscadd: Various things can be built with various sheet types. Experiment! Just + keep in mind that uranium is now radioactive and phoron is now flammable. diff --git a/html/changelogs/Ccomp5950-Goats.yml b/html/changelogs/Ccomp5950-Goats.yml deleted file mode 100644 index be80867380..0000000000 --- a/html/changelogs/Ccomp5950-Goats.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Ccomp5950 -delete-after: True - -changes: - - bugfix: "Beepsky no longer kills goats." - - tweak: "Goats will move towards vines that are 4 spaces away now instead of 1" - - bugfix: "Goats will eat the spawning plants for vines as well as the vines themselves." diff --git a/html/changelogs/Comma-PR-9337.yml b/html/changelogs/Comma-PR-9337.yml deleted file mode 100644 index cf1aac2891..0000000000 --- a/html/changelogs/Comma-PR-9337.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: Chinsky - -delete-after: True - -changes: - - rscadd: "Ghetto diagnosis. Grab patient, aim at bodypart you want to check, click on them with help intent. This will tell you about their wounds, fractures and other oddities (toxins/oxygen) for that bodypart." - - rscadd: "Fractures are visible on very damaged limbs. Dislocations are always visible. Surgery incisions now visible too." - - rscadd: "Stethoscopes actually make sense now. They care for heart/lungs status when reporting pulse and respiration now." \ No newline at end of file diff --git a/html/changelogs/HarpyEagle-fire.yml b/html/changelogs/HarpyEagle-fire.yml deleted file mode 100644 index 66537a821e..0000000000 --- a/html/changelogs/HarpyEagle-fire.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: HarpyEagle -delete-after: True -changes: - - rscadd: "Re-implemented fuel fires. Tweaked fire behaviour overall." diff --git a/html/changelogs/Yoshax - trapping.YML b/html/changelogs/Yoshax - trapping.YML deleted file mode 100644 index d9b7884761..0000000000 --- a/html/changelogs/Yoshax - trapping.YML +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Yoshax - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - tweak: "Bear traps now do damage when stood on, enough to break bones! Bear traps can now affect any limb of a person who is on the ground, including head! Bear traps are no longer legcuffs and instead embed in the limb they attack." - - tweak: "Bear traps now take several seconds to deploy and cannot be picked up when armed, they must be disarmed by clicking on them. They also cannot be moved then they are deployed." \ No newline at end of file diff --git a/html/changelogs/Zuhayr-materials.yml b/html/changelogs/Zuhayr-materials.yml deleted file mode 100644 index 78d873857c..0000000000 --- a/html/changelogs/Zuhayr-materials.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Zuhayr -delete-after: True -changes: - - rscadd: "Massive material refactor. Walls, beds, chairs, stools, tables, ashtrays, knives, baseball bats, axes, simple doors, barricades, so on." - - rscadd: "Tables are now built via steel then another sheet on the resulting frame. They can then be reinforced by dragging a stack of sheets onto the table." - - rscadd: "Walls are built with steel for girders, then right-click the girder and select the reinforce verb while holding a stack, then click the girders with a final sheet." - - rscadd: "Various things can be built with various sheet types. Experiment! Just keep in mind that uranium is now radioactive and phoron is now flammable." \ No newline at end of file