From a5ef41c0fc150d20f895d4ba579945c2e09a9af7 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 7 Mar 2020 20:31:49 +0100 Subject: [PATCH 1/3] adjust numbers, fix shuttle dropoffs --- code/__HELPERS/game.dm | 4 ++-- code/game/gamemodes/objective.dm | 2 +- code/game/objects/items/melee/misc.dm | 2 +- code/modules/uplink/uplink_items/uplink_bundles.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 75e711ad03..034b5d1825 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -564,13 +564,13 @@ var/list/possible_loc = list() for(var/turf/found_turf in turfs) var/area/turf_area = get_area(found_turf) - if (specific_area) // We check if both the turf is a floor, and that it's actually in the area. // We also want a location that's clear of any obstructions. + if(specific_area) // We check if both the turf is a floor, and that it's actually in the area. // We also want a location that's clear of any obstructions. if(!istype(turf_area, specific_area)) continue if(!isspaceturf(found_turf)) if(!is_blocked_turf(found_turf)) possible_loc.Add(found_turf) - if (possible_loc.len < 1) // Need at least one free location. + if(possible_loc.len < 1) // Need at least one free location. return FALSE return pick(possible_loc) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 2ad3d84fd1..a4b1f68265 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1168,7 +1168,7 @@ GLOBAL_LIST_EMPTY(possible_sabotages) var/found = FALSE while(!found) var/area/dropoff_area = pick(GLOB.sortedAreas) - if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors) + if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !istype(dropoff_area, /area/shuttle/)) dropoff = dropoff_area found = TRUE diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 3dcf6d36e7..a75e881953 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -378,7 +378,7 @@ item_flags = NONE force = 5 cooldown = 20 - stam_dmg = 45 //3 hit stamcrit + stam_dmg = 45 //4 hit stamcrit affect_silicon = TRUE on_sound = 'sound/weapons/contractorbatonextend.ogg' on_stun_sound = 'sound/effects/contractorbatonhit.ogg' diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm index 039a29a69d..1c7d3393ab 100644 --- a/code/modules/uplink/uplink_items/uplink_bundles.dm +++ b/code/modules/uplink/uplink_items/uplink_bundles.dm @@ -38,7 +38,7 @@ specialised contractor baton, and three randomly selected low cost items. Can include otherwise unobtainable items." item = /obj/item/storage/box/syndie_kit/contract_kit cost = 20 - player_minimum = 20 + player_minimum = 15 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) /datum/uplink_item/bundles_TC/cybernetics_bundle From bbf43b0464d870fa3b723f12973caaf885e37f4e Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 7 Mar 2020 20:48:04 +0100 Subject: [PATCH 2/3] whoopsies almost forgot this --- code/game/objects/items/storage/uplink_kits.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index ab55555562..d4d45b603c 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -481,8 +481,7 @@ /obj/item/clothing/gloves/krav_maga/combatglovesplus, /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot, /obj/item/reagent_containers/syringe/stimulants, - /obj/item/storage/box/syndie_kit/imp_freedom, - /obj/item/toy/eightball/haunted + /obj/item/storage/box/syndie_kit/imp_freedom ) var/obj/item1 = pick_n_take(item_list) var/obj/item2 = pick_n_take(item_list) From dff0e03f11803ec7b6a8940bdebf08ae20c3d013 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sun, 8 Mar 2020 00:27:16 +0100 Subject: [PATCH 3/3] fixes null runtime and baton inhands --- .../antagonists/traitor/syndicate_contract.dm | 6 ++++++ .../programs/antagonist/contract_uplink.dm | 9 +-------- icons/mob/inhands/weapons/melee_righthand.dmi | Bin 2806 -> 2804 bytes 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index c22012fe87..20d07556c1 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -2,6 +2,7 @@ var/id = 0 var/status = CONTRACT_STATUS_INACTIVE var/datum/objective/contract/contract = new() + var/target_rank var/ransom = 0 var/payout_type = null var/list/victim_belongings = list() @@ -13,6 +14,11 @@ /datum/syndicate_contract/proc/generate(blacklist) contract.find_target(null, blacklist) + var/datum/data/record/record = find_record("name", contract.target.name, GLOB.data_core.general) + if(record) + target_rank = record.fields["rank"] + else + target_rank = "Unknown" if (payout_type == CONTRACT_PAYOUT_LARGE) contract.payout_bonus = rand(9,13) else if(payout_type == CONTRACT_PAYOUT_MEDIUM) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm index 42af956e2e..35470cdee9 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm @@ -129,16 +129,9 @@ "item_icon" = hub_item.item_icon )) for(var/datum/syndicate_contract/contract in traitor_data.contractor_hub.assigned_contracts) - var/target_rank = "" - if(contract.contract.target) - var/datum/data/record/record = find_record("name", contract.contract.target.current.real_name, GLOB.data_core.general) - if(record) - target_rank = record.fields["rank"] - else - target_rank = "Unknown" data["contracts"] += list(list( "target" = contract.contract.target, - "target_rank" = target_rank, + "target_rank" = contract.target_rank, "payout" = contract.contract.payout, "payout_bonus" = contract.contract.payout_bonus, "dropoff" = contract.contract.dropoff, diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi index 7284f43e6046c2ede773573532f498c1aba31cef..9c734fbb9394c292453de9975d0dfa006c6d83a2 100644 GIT binary patch delta 2278 zcmY*Ydpy(o8!wtsF1bc1nvhGVjN>+QtK@R(M1&ZMa&5&lmv1HJQZ7HVn7hato6t{% z&?=qNWfDei+p%HDVly^lKmA_k_dA{EkN4~KJkRU(dEW2$=XrR_T;(Rwc7S%$34S)A z^jld3>Whn#bJ3Z~yl3%)t@c_yT#$Q)w)PHhF`=l!tDSIi<3XbN>Xo;ULy4T)&mYP{ z%5L~XFr69=w*82k(hG%~+r-0qznLCYBzvrseZkiikDLZN42^^X?|M0&3W2`#afF5;1g=K2iiP<;ln~ zM)Pn=`Hi!^{ck4?ggS^$7*$i3Ytcfs$_e4o<#-e>t!eIw3=r6RtJMw_6()p zTquXY43q1()Z14qlNAvld{@C(90Qf+Y^LI!XV5gWR)jb0QAB_VVl`{)6&c6x)R`g~ zD6(O=(LVW-ZsHWSpDtAnY}Iv}!d{4sg)(Fx!pJLBw-4cWk!BvOvSFxj6H+8pjFi>q zD1G)u8*aZ?TQ#pZ#=AT0YVRBIPTti0hEuC81Zh-R4LqzKvdod>NV5%KBZD8~=4I}Q zy~)i`(GLDe#?}_6oH=4$H^epND>@{JjQR9qfLMRE>Mp|*_hRl-fdJf=a zvhyTNV{ct}$FaDSVZlKyx0)k`Q+{=!f?o-e7CIE5WSXiBGkSizbtiSFfo;zSD2t>u zFRea9eR4;k0zRY${S>pj1*8xunJ7>uTR~P<*B!e|L=@NyltW7q9I?3((G3vr4}O*B z3O}*$r?7o_!dRA&$lPeRIC6;deuP7=<+P`-vJVeR3UY)<-l`n-6Z`8#SE8Td5Q>3q z=>nczPobhE>OPr-0iswImr3giJvD;@iV zn6I_Oz>^kP1+5h!&up&!BIJ%NduF!yU2)%2)Q$B`AsM&)H-iJ)LLT#uDF!Z2a24$j+>0hq;yv?F{8g(O%&S+!v*(0 zR>aToe!IhdT9|GO6pA{r<1gWp641!11wE(q>tV0dxzV&)+txIj&_@(|wnWZ^gI~f? zA{sLxqttmPZo6pno^TsqPV#T(W_4HKEYCh|*()eKBP2PtX{_4723UI4IJs;3LW1T6 z&Q&};_J&&kJ$zP{3dTgI$~k`OYw?rwnfMHA^CN0791oH4c>hk`|LnuA!0wd(~~woN0GcSZz*qaiB;UFivso zJI;SW+)XkO5Ul;F_uuHLHRLvvq#kHO1-MTL5EB;-z`6DSC0RIXWNKj0V6VE$b4t;C&YcBlv4>o4auLDqZ~!R>OR@$* zlRDI*kFH+!co&UjjqUavFUf7gTBKi-ddDB>i}Q3qWorN?{!fNZ5Yvc>JI+jpWl#A8 z2cPV7#n|@?Bd_`!4kO2n@+@I~8iegGz&9~Gr{$W*0q~jiH?qyQ25Dnrh_4O(1#MTS z>otsd87SwMIPYpJ0=p<)3JASZ3U< zqr->Hq&slu8g|(_|9xKDwlSD?4tr$^fa?aG)a`4NdwNPucgAkVCL$6qY$!F;g)!Kdw*gRV6{N++E? KoQMuVxBmlK%VZq@ delta 2280 zcmY+Cc{J4f8^=Ya5mCufhN(!@m6ow(Zww{UDA$tp_e+G#SjNni=8KW76hGBZku|&Q z>tF^$#I-e+Aq>LMj3vf08Z%e-+i%sBEjC&1r%M9 z@P40?XCo}|SY zd8tCP7|3F$wtXTp3jps`Z2mYI32GXnLl?#A4`}S7Nq3gG`WYBSle_8rBFq(2n-4Sr zbkn0^)ydDl)l_vfm5wz~T_86GZrztjUP5?jVXY=!_`It({BU5R#RWMtv7@~xx71a0 zLQD1Jo&M+9ab%mVYc0V*v985D>RuEE(#|5JvC4=Z@_A)L}R!9wS*ed*0T}yR5$bpl7yGBm-&$NHZ(1@kIq?hMGTEP56uh7C1?UV)uU3$MbNh@1|d^=>b20=Vc9+b<`5e0&kJjTMN1)L3`-F z^t?~-^6!xuFG>E1)-&Hp=k-kQ;-YCqUf_?BnvGc{V@fqR^1003=z-HFr3I=MHhr$k zlJ4xI39}J)h2CO?QkQTuK>FCrBK!NEN3LFI?sjVmKU;fVO?m4(fQV32>kTt^sr$%N zp+kZHv=qsXg(v-T7UVHkGe%K5Jg-J(C@3fV#KFi6oGW3Y_i+zAun3uM%b9X5tvYeM zp3%{34n0HbJKmSeT`{pU{<^G$mFGCQA)h{$dbgjYgLgk;v0_4NE@)EW@lNmZP<;yF zjIZoJ_QWhgxs`82g9?B zzA0uRqW`r|f%LQ&zdy^@(6``49Hax+@!D}fXr;=Bmi^XWl4sW_?sP++gR;Bh<@AMd z(fykeQIV?0)GgmatMMXWYM$8a)+^Q51_NhW4t!io%i&yrF_>y0Af{A>GIp+XZ}{T2Er=zP}^F)JGM{y8Cc+7 z{o`?Ln(gKmago%6ZbS?9}vSrGRX?XXJA#v|6`e4t2|@Is{Kk zrAukHnb3@hp@UNxAX%_nzC$8eUVJ${24^xaSdAifFW0nsO!lo(7FFe!EueVVqpmqC zUCejYmQ4q9iZsy4pXlA1LoP6JJDq)c{@}i<`rE5z2HJMMNU2nVhjT;A!U5_H;w7Bg z0d%ciPB9u57{w&OYnr1@Fj8#?E1gNjz*$JQyyjPs|NDt(mS!IFej~cAW39k>{hJ(B z2H@5O+1qMgzW5b2Gb9a*pz|DD`>tN!VbIlcKD=3YLLPp^{SZlx+poEkPPP<({+0NQ zKTgt?$9P^toF~Hr;$~3mR`bMS*M1r912m4kI@^UKn3Xs;?w`vYK*H9TKqk z@?g%OTV!PM;#;}t{5xykzR$)@ISTsYH3P>J`^HbU1ERJ?8vpaoU@C;Y;EYUbze=(@ zT>0rlJk0P8WO#qIqn4;rPp@>lS7^UWz0p@LD%Rwz;gaSHrmppfr-Sbb(vEZ=!+W!;8spNihZ|CsKOuh4thZ6D=aStdFd~4b9QX znzadIfN+2im;~XBB#wNxN85nD_slgCK+{xZ+n1%fKAW36*~rZEhL$HDQ zundn>1CDM~H;mO#4$E+3+b;2ufwVJanCaotfm=lULM;b@Sh;Dh-7qqlAS=GCuVq*w zBGWBD;n;dECgZrn;7#Sent0IrK`Rn#bI1ZE9M?u-9$-_Z$MFqW6 zU9qh)^tV6(nHGuu+M3ZWT2lNYKVEt_zay5!LhXb2g3-=ScdSI3JG`4+oLc-Cg*>B; zX16c6@Pte