From 2352001cfb5636d57b53d490bce0b3c3f97280cb Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 10 Nov 2016 22:53:59 -0600 Subject: [PATCH 1/9] Adds teargas grenades, currently aspawn only --- .../items/weapons/grenades/chem_grenade.dm | 23 +++++++++++++++++++ .../objects/items/weapons/storage/boxes.dm | 10 ++++++++ 2 files changed, 33 insertions(+) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index be7d90830d..0ec3dc13df 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -278,3 +278,26 @@ beakers += B1 beakers += B2 icon_state = initial(icon_state) +"_locked" + +/obj/item/weapon/grenade/chem_grenade/teargas + name = "tear gas grenade" + desc = "Concentrated Capsaicin. Contents under pressure. Use with caution." + stage = 2 + path = 1 + + New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src) + + B1.reagents.add_reagent("phosphorus", 40) + B1.reagents.add_reagent("potassium", 40) + B1.reagents.add_reagent("condensedcapsaicin", 40) + B2.reagents.add_reagent("sugar", 40) + B2.reagents.add_reagent("condensedcapsaicin", 80) + + detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + + beakers += B1 + beakers += B2 + icon_state = initial(icon_state) +"_locked" \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f8d5376a64..5c3d090d71 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -339,6 +339,16 @@ for(var/i = 1 to 7) new /obj/item/weapon/grenade/chem_grenade/metalfoam(src) +/obj/item/weapon/storage/box/teargas + name = "box of teargas grenades" + desc = "A box containing 7 teargas grenades." + icon_state = "flashbang" + +/obj/item/weapon/storage/box/teargas/New() + ..() + for(var/i = 1 to 7) + new /obj/item/weapon/grenade/chem_grenade/teargas(src) + /obj/item/weapon/storage/box/trackimp name = "boxed tracking implant kit" desc = "Box full of scum-bag tracking utensils." From 585a6b04af0cb6ae8bcf03ab9f41d05f0ee34c28 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 14 Nov 2016 15:09:29 -0600 Subject: [PATCH 2/9] Moves armor set slowdown to torso, from arms --- code/modules/clothing/gloves/arm_guards.dm | 1 - code/modules/clothing/suits/armor.dm | 5 ++- html/changelogs/Anewbe - Armor.yml | 36 +++++++++++++++++++++ icons/mob/suit.dmi | Bin 425048 -> 425049 bytes 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Anewbe - Armor.yml diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm index 7fe17dd758..ef7d0b28dc 100644 --- a/code/modules/clothing/gloves/arm_guards.dm +++ b/code/modules/clothing/gloves/arm_guards.dm @@ -2,7 +2,6 @@ name = "arm guards" desc = "These arm guards will protect your hands and arms." body_parts_covered = HANDS|ARMS - slowdown = 0.5 overgloves = 1 w_class = ITEMSIZE_NORMAL diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ea2983c2e0..1fe671cc29 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -58,6 +58,7 @@ icon_state = "bulletproof" item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor") blood_overlay_type = "armor" + slowdown = 0.5 armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.7 @@ -71,6 +72,7 @@ desc = "A vest that excels in protecting the wearer against energy projectiles." icon_state = "armor_reflec" blood_overlay_type = "armor" + slowdown = 0.5 armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.1 @@ -100,6 +102,7 @@ desc = "A vest that protects the wearer from several common types of weaponry." icon_state = "combat" blood_overlay_type = "armor" + slowdown = 0.5 armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 30, bio = 0, rad = 0) siemens_coefficient = 0.6 @@ -334,7 +337,7 @@ icon_state = "webvest" item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat") armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) - slowdown = 1 + slowdown = 0.5 /obj/item/clothing/suit/storage/vest/heavy/officer name = "officer heavy armor vest" diff --git a/html/changelogs/Anewbe - Armor.yml b/html/changelogs/Anewbe - Armor.yml new file mode 100644 index 0000000000..6b01880851 --- /dev/null +++ b/html/changelogs/Anewbe - Armor.yml @@ -0,0 +1,36 @@ +################################ +# 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: Anewbe + +# 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: "Slowdown in armor sets moved to chest and legs, rather than arms and legs." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 9c6fcf25d9c1a0120c2fd83216ca733c97fa1bf6..51aaaa0778dd43a02d6777440e74de2b936f7062 100644 GIT binary patch delta 2252 zcmV;-2s8KC_!-&w8IU9a6Oko9fAv8sR`9k`KDp|7yMYFXk7iT9uKx4qU!VV3efsX^%dWR&`X?7Eyn0>z(sGwAbNS`*p>vW~ud9!b z4;!JtdG)&bZ~-??xC*r{AxzVAWFZf+J15Df{s6(5%_y#5@Eb)}l3<37f8$tOt_P}h zsWAbFLkevk9boVXHhb#|Fa}5bzrKUn%qHpZDl1gCC)72F-&}-TZ%gw=W(&;KVp#$( zy*#xhQQh8=Ytq0GhLJfiV|B)R9ji0GbMNIjCTr`I5eBSe^0KliBKM^_(G( z&&LVJTnKlKY97x7RdyI0QD_re@?9u|`N`sqhy59W$`L|xq8 z1!HYFu=i;XJ6Phn=OFT4!#4OMQ_@$Jbz?awUGyAPE_O~-{L#LmMMn<`#i`rcxGG$5 zP_gg?>V*}caswD8;;n8+iP!D^@V;d4zL9k64Q=ZOyop8DZ;;%%f8@Dz9HA*{lXo2*25}7B$Z3!i zp%o;gxa9-X1T*>~spa}ZGNfp1{Vr%Jm$AOoym8DNp%a+x!L{yf%*B~H7pNbzaDA-_ z)Q=gO_J*Wull1k+lVY|`utRpCx|=XwTNmpiVpDGY$f}K0E$AZc4xl1!HqNjVilD%ztg&xX#%&)Pqv-Hap=r?+qjws0 zV>9fNpJ#n;e^8qw9J4bS+c7UVvLr2yH$DL~ZQ%iv|$Yw z43>BUT;E$sd-$F-NEwDCC7@Rmgpf|G_ zi)Ky9Y*FiT7|)D@#xJNM-wQYV%&HQ&p!o%@$%f;jdWKc$e9-=a2CtySq1G=bxV?_3 z48~ela;^wosGY&tv<6M)5@<<-YOwVZK zIto~H1U&L7v@ECf9Z9(_cQoW`6`Xg4n_gX*^U7L8>Aqj3f8HlJ;DGoQsgzPGb%Qt$e9QW%e6r5M!362qruho zHSF}FwqXmAlW8(ajf8X5{YWZ#+55Ni*eB+#xsbW+b|Pc4uh zf3<2zdd%vn#1AwKR|J|wg=6m`!$Wt%v2o_k8SET#p&^z^NEx(CB>?X#O`?*G<7gNS z^F%|ZogZy~XAsMulY}J5#!C{CAV-CE^q$KgDb-W`GZs3zO)n9IH=Yet_&68f>7+Fl zJIl1IKNcNRvH8mglyjC2+}1i|k1-sJe@XRP!Q?wb1J-326s8{(Cj9ZZd?j=G`(BT{ zFzR@mlG4-5p!!8?4`j*m9xS60m+IEUCEQvQdEabCUthfPo(eV|EECw60Hi5Ta6odJ zCzyfk{uxG=oGrA@O|MdRoYDK$j&ms#jc1C9TD0(F#~Hu)*_0J6I?<^0!H7|qe?Q}> z{o@NQg^RfY^|EJdBb&m1q`~$qHHuNwxtR$xW2bX6S13nN=jcj=`Z{l$3Rg=FoKE3$ zB!DwjXpv=pAj8-<6axXrvwVo1GXz|p&g2@aiofF5U@6g+3M-|$5+U2bwPwm5t7XW+ z=32wCN7Aupl{Rv{FvoRAq8X$+fBFxMjJSS{Ox9g;H=vJ~qu2A(^V9Rw>{~XD{q#Iw zxnWko;`%j~RuI>(PxnHknnhf{4lbhT-hIPNg7-&p{W`Px-(L`k-5!rN>yu|I?0u6* zhkjZ!SKz~u53zHMT>dUJgie*WmZXCx(QIn0;TExh*smOc(V4YCQ~huyK&ubcDNR%N z@oqueT(1&F7vD(Jv$Fu$z^4?Bwn;PHJ)y8 zKmESc8B2lv%};n{r|p-gtAg>3rx<}(t49tfZJj`%vULJ))XTr)8a8>W2LGK_D!jue zR>*u|;g~kU9UO#4xKlM5k8dN~;W2K6J6-TJv8FF$y*_ddobykKb-MVIexu6uRhYD%Z_4i&pP%%t>vzY| z1=WO_D|F_y9lIgc>Cg#Me5yvq`{$!LfG`80c#N%5xn-)-r!RV3k~X z1b!H5O5nhr{Rn-aaZDyQ;5+}zdj5mo>iBi_=RcoTpZ@;*_EFx2T6lJ35P!k a0f#>c0*5~d1BX8e1cyHf1-Cy51{rhr_G!TY delta 2218 zcmV;b2vzsl_!-#v8IU9a5|Jf8ed~((Eb^{F%AI+wIUH#|Jzdrx7`t6u&Z1&a_U<{7nmaa!|oK^Cf-NusY+dC$rVj>N!Im zpN|ucxe)Fe)jVDZs_Zbzf8beX|58)MlThrHE-p1yycg!E^Kc=lub+NY_F$=~N7Tjb zT`<;`1ACwLu!Bon_Z&ptYuE;VWJ>y~vTiH~rHh`U%Eiu!ia**{wCLzTp*VG08&`!3 z4k{L&K)tX6RBiyHM7-7QDDk@8AKsVj-8YhMy`gRWfH$$o`VEphf0sNL5Y7|}RjIeJ z>+3z~xUea1S0|0-O%bH2cV3+i^bEv2khol*HHL;VMpwUF#If$vSQfA0Q@$JV8VXc%SC@@gm8+IlU(+!*W3mLoJpZSt<8!yt}<8#xV< zBD8{p6t{eUnqWp>B(+?BNQM-Rt=|PL6gccjy)Y# zud5GFAD%uuJ_zq!>@E!zHa4a}(XcePC-B19%hSu#%i^xIV{*>?PlU*z#uGXfWh;0m0KXDXKA z$KVogfa`lJX%FAimN1yoTPl>zX}-%R+*(%F(Z#p=jVm6)VCzjtp#|2a34;@-2lQsP zV9~58nJsF43FDb@(D)fuKf4#2${q)Cj+S`QHSJIyAk8=?++iA?9U|jLo3b_zrVYwEl-3WL0Xf(Lm zzJ{HiTdfDIPRb-Idlw4}vNg;wga#L3v%y8ss-dBfL-w5o4YBsnNdoQKLnrlY_S6FD ze^IN3q{pnDO8h{>a7Ca=R5(j+R`IF5$V zFi$je+WFD;H-lLIoFpVcHeQmD1UV|SqxW0}NvWRdU$D^0ZF-3yyzyv@QFu-zt+BXS zrd|D!=$MMlUq+ymvvlB=)*<_g;aE(nf7b~n-x(UPF2kTO{h%n}kH^c`F{i)p^~lSj zj>jn>J-rC3U$XWMN&1UrVg)8r=VB^6ufsF}3it+>pB%gVL z8OZF0!=HI`Bk z*RM}^LZp&KT)z%3qUhdz!%TvAM{)f+v-#g&5Q*I!k2dR*XDjS|lShYsR`bOKNh3=kESTb7{O_$CJh#_B?6QV0|~UE5eng9qe7HmBy3mIo^Z z0#(>vNR!3~Dp*+pJ&(uV0l0@po8;Z`dFyo)`S8=J`+C4`F-ir=4pztkB^f&I@@r|b#f!C@>4k&A#K%lC10&mpHzvCJ^02-h?=vAQ`_NDf9x%VAK+1WGi*mKT5CD!TUPx_52 z*H>ZEdcG;YV|;$nx31qEM;BBRYN=h&nb&sghFGUVC;XL2?c}FAryH}pWzQx73kJvD zL13V-0VvIN1X;`c^?+4z Date: Mon, 14 Nov 2016 15:55:31 -0600 Subject: [PATCH 3/9] Fixes a sleeper bug --- code/game/machinery/Sleeper.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7193a7907b..f69f5f6b2a 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -20,9 +20,10 @@ var/obj/machinery/sleeper/sleepernew = null for(dir in list(NORTH, EAST, SOUTH, WEST)) // Loop through every direction sleepernew = locate(/obj/machinery/sleeper, get_step(src, dir)) // Try to find a scanner in that direction - if(sleepernew) - sleeper = sleepernew - sleepernew.console = src + if(sleepernew) + sleeper = sleepernew + sleepernew.console = src + return return /obj/machinery/sleep_console/attack_ai(var/mob/user) From 4a7f88555a77a721c182b9e5c30334a28ae1af9f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 14 Nov 2016 17:55:53 -0600 Subject: [PATCH 4/9] Adds flashlights to loadout --- .../preference_setup/loadout/loadout_eyes.dm | 4 +++ .../loadout/loadout_utility.dm | 9 +++++ .../changelogs/Anewbe - LoadoutFlashlight.yml | 36 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 html/changelogs/Anewbe - LoadoutFlashlight.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index b7aedb8790..5909b0eb2e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -38,6 +38,10 @@ display_name = "Security HUD, prescription (Security)" path = /obj/item/clothing/glasses/hud/security/prescription +/datum/gear/eyes/security/sunglasshud + display_name = "Security HUD, sunglasses (Security)" + path = /obj/item/clothing/glasses/sunglasses/sechud + /datum/gear/eyes/secaviators display_name = "Security HUD Aviators" path = /obj/item/clothing/glasses/sunglasses/sechud/aviator diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 40d1efb748..653f925641 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -39,4 +39,13 @@ /datum/gear/utility/securecase display_name = "secure briefcase" path =/obj/item/weapon/storage/secure/briefcase + cost = 2 + +/datum/gear/utility/flashlight + display_name = "flashlight" + path = /obj/item/device/flashlight + +/datum/gear/utility/maglight + display_name = "flashlight, maglight" + path = /obj/item/device/flashlight/maglight cost = 2 \ No newline at end of file diff --git a/html/changelogs/Anewbe - LoadoutFlashlight.yml b/html/changelogs/Anewbe - LoadoutFlashlight.yml new file mode 100644 index 0000000000..1803d96711 --- /dev/null +++ b/html/changelogs/Anewbe - LoadoutFlashlight.yml @@ -0,0 +1,36 @@ +################################ +# 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: Anewbe + +# 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: + - rscadd: "Added flashlights, maglights, and the secHUD sunglasses (Sec only) to the loadout. " \ No newline at end of file From 726015fcd23b6d6a5255153ad4af4d2427264a37 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 15 Nov 2016 18:27:40 -0600 Subject: [PATCH 5/9] Fixes the silent ERT --- code/game/response_team.dm | 2 +- html/changelogs/Anewbe - ERT.yml | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Anewbe - ERT.yml diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 60a17a1ff2..5892b7f6e5 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -5,7 +5,7 @@ var/global/send_emergency_team = 0 // Used for automagic response teams // 'admin_emergency_team' for admin-spawned response teams var/ert_base_chance = 10 // Default base chance. Will be incremented by increment ERT chance. var/can_call_ert -var/silent_ert +var/silent_ert = 0 /client/proc/response_team() set name = "Dispatch Emergency Response Team" diff --git a/html/changelogs/Anewbe - ERT.yml b/html/changelogs/Anewbe - ERT.yml new file mode 100644 index 0000000000..3fa4ffcb31 --- /dev/null +++ b/html/changelogs/Anewbe - ERT.yml @@ -0,0 +1,36 @@ +################################ +# 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: Anewbe + +# 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: + - bugfix: "Fixed all ERT calls being silent, regardless of selected option." From be4aa63263b21aee75d4e99d40deea2c6f08c839 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 15 Nov 2016 19:50:28 -0600 Subject: [PATCH 6/9] AP bullets --- code/datums/uplink/ammunition.dm | 14 +++++++- code/modules/projectiles/ammunition/boxes.dm | 12 +++++++ .../modules/projectiles/ammunition/bullets.dm | 6 ++++ .../modules/projectiles/projectile/bullets.dm | 6 +++- html/changelogs/Anewbe - AP bullets.yml | 36 +++++++++++++++++++ 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Anewbe - AP bullets.yml diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 33ecddf7da..2611ad18d3 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -18,14 +18,26 @@ name = "Pistol Magazine (.45)" path = /obj/item/ammo_magazine/c45m +/datum/uplink_item/item/ammo/c45map + name = "Pistol Magazine (.45 AP)" + path = /obj/item/ammo_magazine/c45m/ap + /datum/uplink_item/item/ammo/tommymag name = "Tommygun Magazine (.45)" path = /obj/item/ammo_magazine/tommymag +/datum/uplink_item/item/ammo/tommymagap + name = "Tommygun Magazine (.45 AP)" + path = /obj/item/ammo_magazine/tommymag/ap + /datum/uplink_item/item/ammo/tommydrum name = "Tommygun Drum Magazine (.45)" path = /obj/item/ammo_magazine/tommydrum - item_cost = 40 // Buy 40 bullets, get 10 free! + item_cost = 40 + +/datum/uplink_item/item/ammo/tommydrumap + name = "Tommygun Drum Magazine (.45 AP)" + path = /obj/item/ammo_magazine/tommydrum/ap /datum/uplink_item/item/ammo/darts name = "Darts" diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index b1cb0964d1..2ca770dff5 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -53,6 +53,10 @@ name = "magazine (.45 flash)" ammo_type = /obj/item/ammo_casing/c45f +/obj/item/ammo_magazine/c45m/ap + name = "magazine (.45 AP)" + ammo_type = /obj/item/ammo_casing/c45ap + /obj/item/ammo_magazine/c45uzi name = "stick magazine (.45)" icon_state = "uzi45" @@ -75,6 +79,10 @@ caliber = ".45" max_ammo = 20 +/obj/item/ammo_magazine/tommymag/ap + name = "tommygun magazine (.45 AP)" + ammo_type = /obj/item/ammo_casing/c45ap + /obj/item/ammo_magazine/tommymag/empty initial_ammo = 0 @@ -88,6 +96,10 @@ caliber = ".45" max_ammo = 50 +/obj/item/ammo_magazine/tommydrum/ap + name = "tommygun drum magazine (.45 AP)" + ammo_type = /obj/item/ammo_casing/c45ap + /obj/item/ammo_magazine/tommydrum/empty initial_ammo = 0 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 51652c4ccf..2fca9a3ffd 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -63,6 +63,12 @@ caliber = ".45" projectile_type = /obj/item/projectile/bullet/pistol/medium +/obj/item/ammo_casing/c45ap + desc = "A .45 Armor-Piercing bullet casing." + caliber = ".45" + icon_state = "r-casing" + projectile_type = /obj/item/projectile/bullet/pistol/medium/ap + /obj/item/ammo_casing/c45p desc = "A .45 practice bullet casing." caliber = ".45" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index f713f1cf1f..29d130612f 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -127,12 +127,16 @@ damage = 20 /obj/item/projectile/bullet/pistol/ap - damage = 20 + damage = 15 armor_penetration = 30 /obj/item/projectile/bullet/pistol/medium damage = 25 +/obj/item/projectile/bullet/pistol/medium/ap + damage = 20 + armor_penetration = 15 + /obj/item/projectile/bullet/pistol/strong //revolvers and matebas damage = 60 diff --git a/html/changelogs/Anewbe - AP bullets.yml b/html/changelogs/Anewbe - AP bullets.yml new file mode 100644 index 0000000000..7350ffa222 --- /dev/null +++ b/html/changelogs/Anewbe - AP bullets.yml @@ -0,0 +1,36 @@ +################################ +# 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: Anewbe + +# 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: + - rscadd: "Added .45 and tommygun AP ammo to the uplink." From 35b80e8eae20ac7bfa3a5743b5088a6bb4a46573 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 15 Nov 2016 20:23:01 -0600 Subject: [PATCH 7/9] Fixes bears --- code/modules/mob/living/simple_animal/hostile/bear.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 68a7f8cbd3..f4de3b6054 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -129,7 +129,7 @@ return custom_emote(1, pick( list("slashes at [target_mob]", "bites [target_mob]") ) ) - var/damage = rand(20,30) + var/damage = rand(melee_damage_lower, melee_damage_upper) if(ishuman(target_mob)) var/mob/living/carbon/human/H = target_mob From 38aa0217f907f99304c263979c2851769b13c3e6 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Tue, 15 Nov 2016 20:56:58 -0600 Subject: [PATCH 8/9] No longer able to crawl through welded vents. --- code/ATMOSPHERICS/components/unary/unary_base.dm | 2 ++ code/ATMOSPHERICS/components/unary/vent_pump.dm | 2 -- code/modules/ventcrawl/ventcrawl.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index eea2dba1ab..20d37b309c 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -9,6 +9,8 @@ var/datum/pipe_network/network + var/welded = 0 //defining this here for ventcrawl stuff + New() ..() initialize_directions = dir diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 5d5a3496f9..00bc7e5772 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -40,8 +40,6 @@ var/internal_pressure_bound_default = INTERNAL_PRESSURE_BOUND var/pressure_checks_default = PRESSURE_CHECKS - var/welded = 0 // Added for aliens -- TLE - var/frequency = 1439 var/datum/radio_frequency/radio_connection diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 9b2b83d3e7..5c2db9f3de 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -81,7 +81,7 @@ var/list/ventcrawl_machinery = list( var/atom/pipe var/list/pipes = list() for(var/obj/machinery/atmospherics/unary/U in range(1)) - if(is_type_in_list(U,ventcrawl_machinery) && Adjacent(U)) + if(is_type_in_list(U,ventcrawl_machinery) && Adjacent(U) && !U.welded) pipes |= U if(!pipes || !pipes.len) to_chat(src, "There are no pipes that you can ventcrawl into within range!") From f0c26f980ce675be656d122ec1df8d781e10eda8 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Tue, 15 Nov 2016 21:09:03 -0600 Subject: [PATCH 9/9] Fixes welding masks disappearing when flipped wrong. --- code/modules/clothing/head/misc_special.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 0fed75c822..7d86be578f 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -27,8 +27,6 @@ var/base_state /obj/item/clothing/head/welding/attack_self() - if(!base_state) - base_state = icon_state toggle() @@ -37,6 +35,9 @@ set name = "Adjust welding mask" set src in usr + if(!base_state) + base_state = icon_state + if(usr.canmove && !usr.stat && !usr.restrained()) if(src.up) src.up = !src.up