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

Накопительное обновление [THIS IS NOT BUG! - EDITION] #361

Closed
wants to merge 1 commit into from
Closed

Накопительное обновление [THIS IS NOT BUG! - EDITION] #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions maps/torch/items/clothing/solgov-accessory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/command/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the command department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand All @@ -559,7 +559,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/engineering/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the engineering department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand All @@ -577,7 +577,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/security/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the security department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand All @@ -596,7 +596,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/medical/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the medical department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand All @@ -614,7 +614,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/supply/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the supply department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand All @@ -632,7 +632,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/service/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the service department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand All @@ -650,7 +650,7 @@ department tags
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")

/obj/item/clothing/accessory/solgov/department/exploration/army
icon_state = "dept_army"
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the exploration department. These fit Army uniforms."
on_rolled = list("down" = "none")

Expand Down
11 changes: 6 additions & 5 deletions maps/torch/torch5_deck1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26558,15 +26558,16 @@
/turf/simulated/floor/reinforced,
/area/rnd/misc_lab)
"ryt" = (
/obj/item/device/radio/intercom{
pixel_y = 23
},
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/effect/floor_decal/techfloor{
dir = 8
},
/obj/item/device/radio/intercom{
pixel_y = 23
},
/obj/effect/floor_decal/industrial/hatch/red,
/turf/simulated/floor/tiled/techfloor/grid,
/area/command/armoury/tactical)
"rzb" = (
Expand Down Expand Up @@ -58657,12 +58658,12 @@ ajJ
aaa
aaa
acd
acd
dVw
dVw
ryt
svH
svH
svH
njm
ksK
nZZ
Expand All @@ -58677,7 +58678,7 @@ aQq
aQq
eRU
eRU
acd
eRU
acd
aaa
aaa
Expand Down
4 changes: 2 additions & 2 deletions maps/torch/torch6_bridge.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45394,7 +45394,6 @@ aa
aa
aa
aa
aa
ad
ad
ad
Expand All @@ -45414,7 +45413,8 @@ ad
ad
ad
ad
aa
ad
ad
aa
aa
aa
Expand Down
254 changes: 0 additions & 254 deletions proxima/code/game/items/weapons/gun/projectiles/bosnia.dm
View file
Open in desktop

This file was deleted.

Loading
Loading