Skip to content

Commit

Permalink
Bugfixes. (#4685)
Browse files Browse the repository at this point in the history
* Bugfixes.

Fixes a few spelling mistakes here and there.

Forged stock-parts boxes claimed they had five parts inside. they did not, they have four, corrected.

Toga for the church had an eronious base-state, unsure who touched it, but fix'd.

Bat'ko had incorrect formatting for its on-suit sprite, fixed.

Numerical garb eroniously claimed to be switchable between grey and red. It was actually purple and red, fixed.

Numerical hats both had the wrong icon name and were using(incorrectly) the old sprites. Fixed.

Duty had a missing icon when loaded with a drum and fempty(Who the FUCK let the duty take drums?)

Fixes the sec-shuttle and also comments out the destination it has towards the space fortress which is...commented back out? Right?

Fixes the apparent sec-shuttle so its walls are properly named after the vessel. To do- give some fucking flavor to the Rocinante and Vasiliy.

* Update body_modifications.dm

Removes the ability to select robo-torsos/groins/heads, this functionality doesn't actually work as intended and wasn't intended to be used in this way. Feel free to re-add if it does get fixed.
fixes #4675

* More bugfixes

Fixes tesla turrets attacking colony bots, SI drones, etc.

Fixes embed chance on the psion knife being greater than 0 and thus being able to embed(and promptly bugging out.)

* Update tesla_turret.dm

Slight tweak to Tesla turret code courtesy of Hex.

* Further bugfixes.

RXbow lacked a proper caliber and could thusly accept 10mm rounds.

RXbow also lacked a casing handling tag, not that it makes a huge difference given its snowflake behavior but it was fixed.  I will suggest to perhaps raise the d amage of the crossbow bolt in another non-bug focused PR.

Artificer rail pistols(slab and myrmidon) didn't have a serial defined, fixed.

* More fixes.

Mop bucket now properly updates its sprite after any change to its reagents takes place.

Kitchen spike no longer erroneously requires a strangle grab instead of a neck_grab.
  • Loading branch information
cdb-is-not-good authored Jul 10, 2023
1 parent 22d6e5a commit 94b32aa
Show file tree
Hide file tree
Showing 20 changed files with 30 additions and 28 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/projectile_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#define CAL_GRENADE "grenade"
#define CAL_FLARE "flare shell"
#define CAL_CROSSBOW "bolt"
#define CAL_RXBOW "flashforged bolt"
#define CAL_ARROW "arrow"

//Mech Caliber Defines
Expand Down
7 changes: 1 addition & 6 deletions code/game/machinery/tesla_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -524,20 +524,15 @@ GLOBAL_LIST_INIT(turret_channels, new/list(5))
if(get_dist(src, L) > firing_range) //if it's too far away, why bother?
return TURRET_NOT_TARGET

/*
if(colony_allied_turret && L.colony_friend) //Dont target colony pets if were allied with them
return TURRET_NOT_TARGET

if(!colony_allied_turret && !L.colony_friend) //If were not allied to the colony we dont attack anything thats against the colony
return TURRET_NOT_TARGET

if(!colony_allied_turret && L.colony_friend) //If were not allied with the colony we attack them and their pets
if(colony_allied_turret ^ L.colony_friend) //If were allied with the colony and we attack things that are not are pets
return TURRET_SECONDARY_TARGET

if(colony_allied_turret && !L.colony_friend) //If were allied with the colony and we attack things that are not are pets
return TURRET_SECONDARY_TARGET
*/

if(issilicon(L))
if(check_synth) // Destroy all impure inhumane detestable irredeemable robots.
return TURRET_PRIORITY_TARGET
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/weapons/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ Boxes with clothing on them, unable to put them back if taken out because...
// Guild boxes, exclusively used to mass craft guild parts.
/obj/item/storage/box/guild_manip
name = "box of forged manipulators"
desc = "A box containing five forged manipulators, the best that Nadezhda can produce."
desc = "A box containing four forged manipulators, the best that Nadezhda can produce."
icon_state = "box_of_doom"
illustration = "guild"

Expand All @@ -825,7 +825,7 @@ Boxes with clothing on them, unable to put them back if taken out because...

/obj/item/storage/box/guild_bin
name = "box of cast matter bins"
desc = "A box containing five cast matter bins, the best that Nadezhda can produce."
desc = "A box containing four cast matter bins, the best that Nadezhda can produce."
icon_state = "box_of_doom"
illustration = "guild"

Expand All @@ -835,7 +835,7 @@ Boxes with clothing on them, unable to put them back if taken out because...

/obj/item/storage/box/guild_laser
name = "box of perfected micro-lasers"
desc = "A box containing five perfected micro-lasers, the best that Nadezhda can produce."
desc = "A box containing four perfected micro-lasers, the best that Nadezhda can produce."
icon_state = "box_of_doom"
illustration = "guild"

Expand All @@ -845,7 +845,7 @@ Boxes with clothing on them, unable to put them back if taken out because...

/obj/item/storage/box/guild_scanner
name = "box of perfected scanning modules"
desc = "A box containing five perfected scanning modules, the best that Nadezhda can produce."
desc = "A box containing four perfected scanning modules, the best that Nadezhda can produce."
icon_state = "box_of_doom"
illustration = "guild"

Expand All @@ -855,7 +855,7 @@ Boxes with clothing on them, unable to put them back if taken out because...

/obj/item/storage/box/guild_capacitor
name = "box of ultra capacitors"
desc = "A box containing five ultra capacitors, the best that Nadezhda can produce."
desc = "A box containing four ultra capacitors, the best that Nadezhda can produce."
icon_state = "box_of_doom"
illustration = "guild"

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/kitchen_spike.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
if(occupied)
to_chat(user, SPAN_DANGER("\The [src] already has something on it, finish collecting its meat first!"))
return FALSE
if(state != GRAB_KILL)
if(state != GRAB_NECK)
to_chat(user, SPAN_NOTICE("You need to grab \the [target] by the neck!"))
return FALSE
if(istype(target, /mob/living/carbon/human))
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures/mop_bucket.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
cut_overlays()
if(reagents.total_volume >= 1)
add_overlay("water_mopbucket")
update_icon()
4 changes: 2 additions & 2 deletions code/game/turfs/simulated/wall_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
icon = 'icons/turf/shuttlemining.dmi'
icon_state = "11,23"

/turf/simulated/shuttle/wall/science
name = "Science Shuttle"
/turf/simulated/shuttle/wall/science //I guess this got repurposed into the Marshal shuttle soooooo-
name = "The Vasiliy"
icon = 'icons/turf/shuttlescience.dmi'
icon_state = "6,18"

Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ obj/item/clothing/head/ribbon/red

/obj/item/clothing/head/numerical_hat
name = "numerical hat"
icon_state = "numerical_hat_red"
desc = "A tall hat for nurmerical of the faith. Can be turned inside out to turn form red to gray or gray to red"
icon_state = "field_numerical_hat"
desc = "A tall hat for nurmerical of the faith. Can be turned inside out to turn form red to purple or purple to red"
armor_list = list( //same as the garb
melee = 10,
bullet = 0,
Expand All @@ -346,8 +346,8 @@ obj/item/clothing/head/ribbon/red

var/mob/M = usr
var/list/options = list()
options["Red Hat"] = "numerical_hat_red"
options["Gray Hat"] = "numerical_hat_dark"
options["Red Hat"] = "field_numerical_hat"
options["Purple Hat"] = "field_numerical_hat_alt"

var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ obj/item/clothing/suit/fluff/miko

/obj/item/clothing/suit/storage/numericalgarb
name = "numerical garb"
desc = "A padded cloak meant for numerical, made to be biomatter resistant. The cloak is reversible, with its switchable colors being red and grey."
desc = "A padded cloak meant for numerical, made to be biomatter resistant. The cloak is reversible, with its switchable colors being red and purple."
icon_state = "field_numerical"
item_state = "field_numerical"
armor_list = list(
Expand All @@ -480,7 +480,7 @@ obj/item/clothing/suit/fluff/miko
var/mob/M = usr
var/list/options = list()
options["Red Garb"] = "field_numerical"
options["Gray Garb"] = "field_numerical_alt"
options["Purple Garb"] = "field_numerical_alt"

var/choice = input(M,"What kind of style do you want?","Adjust Style") as null|anything in options

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/under/jobs/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
/obj/item/clothing/under/rank/church/toga
desc = "Smells like laurel wreath."
name = "church toga"
icon_state = "numerical_garbs_red"
icon_state = "churchtoga"

/obj/item/clothing/under/rank/church/toga/toggle_style()
set name = "Adjust Style"
Expand All @@ -205,7 +205,7 @@

var/mob/M = usr
var/list/options = list()
options["Red"] = "numerical_garbs_red"
options["Red"] = "churchtoga"
options["Red Pauldronless"] = "churchtoga_alt"
options["Black"] = "churchtoga_black"
options["Black Pauldronless"] = "churchtoga_blackalt"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/organs/body_modifications.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ var/global/list/modifications_types = list(
id = "prosthesis_asters"
replace_limb = /obj/item/organ/external/robotic/asters
icon = 'icons/mob/human_races/cyberlimbs/asters.dmi'
body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG, BP_CHEST, BP_GROIN, BP_HEAD)
body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG)

/datum/body_modification/limb/prosthesis/serbian
id = "prosthesis_serbian"
replace_limb = /obj/item/organ/external/robotic/serbian
icon = 'icons/mob/human_races/cyberlimbs/serbian.dmi'
body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG, BP_CHEST, BP_GROIN, BP_HEAD)
body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG)

/datum/body_modification/limb/prosthesis/frozen_star
id = "prosthesis_frozen_star"
Expand All @@ -206,7 +206,7 @@ var/global/list/modifications_types = list(
id = "prosthesis_ghetto"
replace_limb = /obj/item/organ/external/robotic/junktech
icon = 'icons/mob/human_races/cyberlimbs/advanced_ghetto.dmi'
body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG, BP_CHEST, BP_GROIN)
body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG)

/datum/body_modification/limb/prosthesis/synthskin
id = "prosthesis_full_body_prosthetic"
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/energy/projectile/railgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
init_recoil = RIFLE_RECOIL(0.8)
can_dual = TRUE
twohanded = FALSE
serial_type = "AG"
init_firemodes = list(
list(mode_name="slug", mode_desc="fires a small metal chunk at light speeds", projectile_type=/obj/item/projectile/bullet/kurtz_50/railgun, icon="kill"),
list(mode_name="non-lethal", mode_desc="fires a small rubber chunk at light speeds", projectile_type=/obj/item/projectile/bullet/kurtz_50/rubber/railgun, icon="stun"),
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/launcher/crossbow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
safety = FALSE
twohanded = TRUE
load_method = SINGLE_CASING
caliber = CAL_CROSSBOW
handle_casings = HOLD_CASINGS
max_shells = 1
ammo_type = /obj/item/ammo_casing/rod_bolt
gun_tags = list(GUN_PROJECTILE, GUN_SCOPE)
Expand Down Expand Up @@ -194,6 +196,7 @@
icon_state = "rxb"
fire_sound = 'sound/weapons/rail.ogg' // Basically a downgraded myrmidon.
slot_flags = null
caliber = CAL_RXBOW
draw_time = 7.5
superheat_cost = 150 //guild design, more efficient or something
var/stored_matter = 0
Expand Down
1 change: 1 addition & 0 deletions code/modules/psionics/psionic_items/psi_temp_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
origin_tech = list()
matter = list()
degradation = 0 // Can't degrade
embed_mult = 0 //Shouldn't embed, it's not real.
workspeed = 0.8
use_power_cost = 0 // Don't use power
max_upgrades = 0 // Can't upgrade it
Expand Down
Binary file modified icons/inventory/head/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/suit/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/uniform/mob.dmi
Binary file not shown.
Binary file modified icons/inventory/uniform/mob_fem.dmi
Binary file not shown.
Binary file modified icons/obj/guns/energy/gauss.dmi
Binary file not shown.
Binary file modified icons/obj/guns/projectile/duty.dmi
Binary file not shown.
6 changes: 3 additions & 3 deletions maps/__Nadezhda/data/shuttles-nadezhda.dm
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
/datum/shuttle/autodock/multi/vasiliy
name = "The Vasiliy"
move_time = (7 MINUTES) / (1 SECOND)
shuttle_area = /area/shuttle/rocinante_shuttle_area
shuttle_area = /area/shuttle/vasiliy_shuttle_area
current_location = "nav_vasiliy_homebase"
landmark_transition = "nav_vasiliy_transit"
destination_tags = list("nav_vasiliy_homebase", "nav_vasiliy_deep_forest", "nav_vasiliy_swamps", "nav_vasiliy_river_forest") //, "nav_vasiliy_spacefort"
Expand Down Expand Up @@ -278,13 +278,13 @@
landmark_tag = "nav_vasiliy_river_forest"
base_turf = /turf/simulated/floor/reinforced
autoset = TRUE

/* Pretty sure this isn't even active?
/obj/effect/shuttle_landmark/vasiliy_spacefort
name = "Local Space Station Dock"
landmark_tag = "nav_vasiliy_spacefort"
base_turf = /turf/simulated/floor/reinforced
autoset = TRUE

*/
//Vasiliy console
/obj/machinery/computer/shuttle_control/multi/vasiliy
name = "The Vasiliy shuttle console"
Expand Down

0 comments on commit 94b32aa

Please sign in to comment.