Skip to content

Commit

Permalink
Merge pull request Civ13#2630 from savethetreez/skibidibranch
Browse files Browse the repository at this point in the history
Disables the draw knife verb
  • Loading branch information
savethetreez authored Mar 18, 2024
2 parents 4df168a + deb9617 commit 3730ed3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ BLIND // can't see anything
I.forceMove(src)
holding = I
user.visible_message("<span class='notice'>\The [user] shoves \a [I] into \the [src].</span>")
verbs |= /obj/item/clothing/shoes/proc/draw_knife
//verbs |= /obj/item/clothing/shoes/proc/draw_knife
update_icon()
else
return ..()
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/map_metadata/reichstag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
lobby_icon = 'icons/lobby/reichstag.png'
caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/one,/area/caribbean/no_mans_land/invisible_wall/two)
respawn_delay = 1200
no_winner ="The reichstag is under German control."
no_winner = "The Reichstag is still under German control."
no_hardcore = TRUE
faction_organization = list(
GERMAN,
Expand All @@ -18,7 +18,7 @@
age = "1945"
ordinal_age = 6
faction_distribution_coeffs = list(GERMAN = 0.3, RUSSIAN = 0.7)
battle_name = "battle of the Reichstag"
battle_name = "Battle for the Reichstag"
mission_start_message = "<font size=4>All factions have <b>6 minutes</b> to prepare before the ceasefire ends!<br>The Germans will win if they hold out for <b>40 minutes</b>. The Soviets will win if they manage to reach the top of the Reichstag.</font>"
faction1 = GERMAN
faction2 = RUSSIAN
Expand Down

0 comments on commit 3730ed3

Please sign in to comment.