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.

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

Talos edit, remove guns, change sprite RO cap/uniform #111

Merged
merged 25 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
62121f4
обновление корпсам
Tatarla Jul 13, 2024
18e2690
фикс лодаута
Tatarla Jul 13, 2024
cf1b6e3
Переделал говнокод
Tatarla Jul 13, 2024
4d8dd67
Update defibrillator.dm
Tatarla Jul 13, 2024
3e2a327
исправления по ревью
Tatarla Jul 14, 2024
0619744
Merge branch 'master' of https://github.com/Tatarla/Reborn-Work
Tatarla Jul 14, 2024
ae6cc10
исправление advanced у перчаток
Tatarla Jul 14, 2024
5715f45
Merge branch 'master' of https://github.com/Tatarla/Reborn-Work
Tatarla Jul 20, 2024
9c1324d
Обновление корпсов №2
Tatarla Jul 20, 2024
3fefadd
корректировка цен
Tatarla Jul 20, 2024
94b7c1c
поднял цены на инжекторы
Tatarla Jul 26, 2024
a42f3b5
Merge branch 'PMC-Unga-Marines:master' into master
Tatarla Jul 29, 2024
3d0ac89
Merge branch 'PMC-Unga-Marines:master' into master
Tatarla Jul 29, 2024
84c8f6b
Обновочки по талосу
Tatarla Jul 29, 2024
65ab263
Фикс формата
Tatarla Jul 29, 2024
1f52d40
Merge branch 'PMC-Unga-Marines:master' into master
Tatarla Aug 6, 2024
fb9c026
Merge branch 'PMC-Unga-Marines:master' into master
Tatarla Aug 11, 2024
caa8adb
Merge branch 'PMC-Unga-Marines:master' into master
Tatarla Aug 23, 2024
7c8ae64
все навалом
Tatarla Aug 23, 2024
a253c74
Update marine_vending.dm
Tatarla Aug 23, 2024
4af9e6d
вернул ап и хп патроны
Tatarla Aug 23, 2024
3a594e9
Update marine_vending.dm
Tatarla Aug 23, 2024
9685f39
Update marine_vending.dm
Tatarla Aug 23, 2024
bfe7e2d
Update marine_vending.dm
Tatarla Aug 24, 2024
9b91196
Update marine_vending.dm
Tatarla Aug 24, 2024
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
186 changes: 161 additions & 25 deletions _maps/map_files/Talos/TGS_Talos.dmm
Tatarla marked this conversation as resolved.
Show resolved Hide resolved

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions code/__DEFINES/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list(
/obj/item/explosive/grenade/sticky = list(CAT_MARINE, "M40 adhesive charge grenade", 2, "orange3"),
/obj/item/explosive/grenade/incendiary = list(CAT_MARINE, "M40 HIDP incendiary grenade", 2, "orange3"),
/obj/item/explosive/grenade/m15 = list(CAT_MARINE, "M15 fragmentation grenade", 3, "orange3"),
/obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"),
/obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"),
/obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"),
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
/obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"),
/obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"),
/obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"),
Expand Down
15 changes: 15 additions & 0 deletions code/game/objects/machinery/mortar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,21 @@
new /obj/item/encryptionkey/cas(src)
new /obj/item/hud_tablet/artillery(src)

/obj/structure/closet/crate/mortar_ammo/mlrs_kit
name = "\improper Катюша kit"
desc = "Ящик с РСЗО Катюшка и запасом боеприпасов к ней. Играй, славянка!"

/obj/structure/closet/crate/mortar_ammo/mlrs_kit/PopulateContents()
new /obj/item/mortar_kit/mlrs(src)
new /obj/item/storage/box/mlrs_rockets(src)
new /obj/item/storage/box/mlrs_rockets(src)
new /obj/item/encryptionkey/engi(src)
new /obj/item/encryptionkey/engi(src)
new /obj/item/binoculars/tactical/range(src)
new /obj/item/encryptionkey/cas(src)
new /obj/item/encryptionkey/cas(src)
new /obj/item/encryptionkey/cas(src)
new /obj/item/hud_tablet/artillery(src)

/obj/structure/closet/crate/mortar_ammo/howitzer_kit
name = "\improper TA-100Y howitzer kit"
Expand Down
149 changes: 19 additions & 130 deletions code/game/objects/machinery/vending/marine_vending.dm

Large diffs are not rendered by default.

Binary file removed icons/RO_caps_onmob.dmi
Binary file not shown.
Binary file removed icons/RO_cloth_new.dmi
Binary file not shown.
Binary file removed icons/drill_cap.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/headwear/marine_hats.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/headwear/marine_helmets.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/uniforms/marine_uniforms.dmi
Binary file not shown.
Tatarla marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
Binary file modified icons/obj/clothing/headwear/marine_hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/headwear/marine_helmets.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms/marine_uniforms.dmi
Binary file not shown.
Loading