Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Удаление cricket bat #1583

Merged
merged 4 commits into from
Jan 14, 2025
+3 −5
Merged

Удаление cricket bat #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9324a1b
Update weaponry.dm
FelixRuin Jan 12, 2025
c2d8624
Update 4NaL_Station.dmm
FelixRuin Jan 12, 2025
024603d
Update 4NaL_Station.dmm
FelixRuin Jan 5, 2025
ed80213
Merge branch 'cricket-bat-removal' of https://github.com/FelixRuin/Re…
FelixRuin Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions _maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16290,10 +16290,6 @@
icon_state = "wood_tile"
},
/area/maintenance/space_hut/cabin)
"faj" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/openspace,
/area/space/nearstation)
"fam" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/wood,
Expand Down Expand Up @@ -230896,7 +230892,7 @@ bAb
djY
djY
djY
faj
qbe
qbe
qbe
rOv
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/weaponry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,13 +943,15 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
var/throwforce_off // Damage when off
var/weight_class_on // What is the new size class when turned on

/* BLUEMOON DELETE добавить когда спрайт от него найдётся ;P
/obj/item/melee/baseball_bat/Initialize(mapload)
. = ..()
if(prob(1))
name = "cricket bat"
desc = "You've got red on you."
icon_state = "baseball_bat_brit"
item_state = "baseball_bat_brit"
*/

/obj/item/melee/baseball_bat/chaplain
name = "blessed baseball bat"
Expand Down
Loading