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

Polskie sprity i obiekty #304

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Polskie sprity i obiekty #304

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1cd4d4e
Polskie sprity i obiekty
UnibelUnibel Mar 14, 2024
fdfb896
fix
UnibelUnibel Mar 14, 2024
5c25240
Dodano szachownicę
UnibelUnibel Mar 14, 2024
861950a
poprawka
UnibelUnibel Mar 14, 2024
b97e026
dodaje flagi, godła, krzyże
UnibelUnibel Mar 15, 2024
8e5c7b9
gunwno
UnibelUnibel Mar 15, 2024
7eef1d1
Usuwa runtime
Szyszkrzyneczka Mar 23, 2024
c62cb20
Cała reszta
Szyszkrzyneczka Mar 28, 2024
ba7aba6
Kosmity respią się dopiero po znalezieniu kapitana bomby
Szyszkrzyneczka Mar 29, 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
6 changes: 6 additions & 0 deletions aquila/aquila.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
#include "code\game\objects\effects\decals\cleanable.dm"
#include "code\game\objects\effects\decals\cleanable\feces.dm"
#include "code\game\objects\effects\decals\cleanable\humans.dm"
#include "code\game\objects\effects\polskie_znaki.dm"
#include "code\game\objects\effects\spawners\lootdrop.dm"
#include "code\game\objects\effects\spawners\xenospawner.dm"
#include "code\game\objects\effects\temporary_visuals\projectiles\impact.dm"
Expand All @@ -112,13 +113,16 @@
#include "code\game\objects\items\inducer.dm"
#include "code\game\objects\items\manuals.dm"
#include "code\game\objects\items\melee\misc.dm"
#include "code\game\objects\items\polskie_znaki.dm"
#include "code\game\objects\items\robot\robot_upgrades.dm"
#include "code\game\objects\items\storage\commercial.dm"
#include "code\game\objects\items\tools\crowbar.dm"
#include "code\game\objects\items\tools\powertools.dm"
#include "code\game\objects\items\tools\screwdriver.dm"
#include "code\game\objects\items\tools\weldingtool.dm"
#include "code\game\objects\items\tools\wirecutters.dm"
#include "code\game\objects\items\tools\wrench.dm"
#include "code\game\objects\structures\flags.dm"
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\crucifix.dm"
#include "code\game\objects\structures\crate_lockers\closets\secure\engineering.dm"
Expand Down Expand Up @@ -184,6 +188,7 @@
#include "code\modules\metacoin\metacoin.dm"
#include "code\modules\mining\equipment\mineral_scanner.dm"
#include "code\modules\mining\machine_bluespaceminer.dm"
#include "code\modules\mob\dead\new_player\sprite_accessories.dm"
#include "code\modules\mob\dead\observer\observer.dm"
#include "code\modules\mob\living\carbon\alien\alien.dm"
#include "code\modules\mob\living\carbon\carbon.dm"
Expand Down Expand Up @@ -298,6 +303,7 @@
#include "code\modules\surgery\implant_removal.dm"
#include "code\modules\uplink\uplink_devices.dm"
#include "code\modules\uplink\uplink_items.dm"
#include "code\modules\vehicles\cars\maluch.dm"
#include "code\modules\vending\boozeomat.dm"
#include "code\modules\vending\cola.dm"
#include "code\modules\vending\security.dm"
Expand Down
58 changes: 58 additions & 0 deletions aquila/code/game/effects/decals/turfdecal/markings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,60 @@
/obj/effect/turf_decal/caution
icon = 'aquila/icons/turf/decals.dmi'

/obj/effect/turf_decal/szachownica
icon = 'aquila/icons/turf/decals.dmi'
icon_state = "96_middle"

/obj/effect/turf_decal/szachownica/corner_white64
icon_state = "64_corner_white"

/obj/effect/turf_decal/szachownica/corner_red64
icon_state = "64_corner_red"

/obj/effect/turf_decal/szachownica/corner_white96
icon_state = "96_corner_white"

/obj/effect/turf_decal/szachownica/spacercorner_white96
icon_state = "96_spacercorner_white"

/obj/effect/turf_decal/szachownica/middle96
icon_state = "96_middle"

/obj/effect/turf_decal/szachownica/spacermiddle96
icon_state = "96_spacermiddle"

/obj/effect/turf_decal/szachownica/corner_red96
icon_state = "96_corner_red"

/obj/effect/turf_decal/szachownica/spacercorner_red96
icon_state = "96_spacercorner_red"

/obj/effect/turf_decal/szachownica/corner_white192
icon_state = "192_corner_white"

/obj/effect/turf_decal/szachownica/middle_white192
icon_state = "192_middle_white"

/obj/effect/turf_decal/szachownica/border_white192
icon_state = "192_border_white"

/obj/effect/turf_decal/szachownica/spacermiddle_white192
icon_state = "192_spacermiddle_white"

/obj/effect/turf_decal/szachownica/full_white192
icon_state = "192_full_white"

/obj/effect/turf_decal/szachownica/full_red192
icon_state = "192_full_red"

/obj/effect/turf_decal/szachownica/spacermiddle_red192
icon_state = "192_spacermiddle_red"

/obj/effect/turf_decal/szachownica/border_red192
icon_state = "192_border_red"

/obj/effect/turf_decal/szachownica/middle_red192
icon_state = "192_middle_red"

/obj/effect/turf_decal/szachownica/corner_red192
icon_state = "192_corner_red"
Comment on lines +3 to +60
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

troche dziwne że typepath jest polskie szachownica a potem angielskie corner_red192 itp..

42 changes: 42 additions & 0 deletions aquila/code/game/objects/effects/polskie_znaki.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/////////////////
//Krzyże
//////////////////
/obj/structure/sign/kszysz
icon = 'aquila/icons/obj/kszysz.dmi'
layer = ABOVE_WINDOW_LAYER

/turf/closed/wall/proc/place_kszysz(obj/item/wallframe/kszysz/P, mob/user)
to_chat(user, "<span class='notice'>Wieszasz krzyż na ścianie... Akcja godna roku 1997.</span>")
var/obj/structure/sign/kszysz/D = P.kszysz_structure

/obj/structure/sign/kszysz/kszysz_drewniany
name = "drewniany krzyż"
desc = "Panie, zmiłuj się nad nami"
icon_state = "kszysz_drewn"

/obj/structure/sign/kszysz/kszysz_zloty
name = "złoty krzyż"
desc = "Panie, zmiłuj się nad nami - ale ze stylem."
icon_state = "kszysz_zloty"

/////////////////
//Godła
//////////////////
/obj/structure/sign/godlo
icon = 'aquila/icons/obj/godla.dmi'
layer = ABOVE_WINDOW_LAYER

/turf/closed/wall/proc/place_godlo(obj/item/wallframe/godlo/P, mob/user)
to_chat(user, "<span class='notice'>Wieszasz godło na ścianie.</span>")
var/obj/structure/sign/godlo/D = P.godlo_structure

/obj/structure/sign/godlo/godlo_drewniane
name = "godło w drewnianej ramie"
desc = "Wizerunek orła białego ze złotą koroną na głowie zwróconej w prawo, z rozwiniętymi skrzydłami, z dziobem i szponami złotymi, umieszczony w czerwonym polu tarczy."
icon_state = "godlo_drewno"

/obj/structure/sign/godlo/godlo_czarne
name = "godło w czarnej ramie"
desc = "Wizerunek orła białego ze złotą koroną na głowie zwróconej w prawo, z rozwiniętymi skrzydłami, z dziobem i szponami złotymi, umieszczony w czerwonym polu tarczy."
icon_state = "godlo_czarne"

99 changes: 99 additions & 0 deletions aquila/code/game/objects/items/polskie_znaki.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
////////////////////
//Sztandar
///////////////////
/obj/item/banner/polski_sztandar
name = "polski sztandar"
desc = "Za ojczyznę!"
icon = 'aquila/icons/obj/banners.dmi'
icon_state = "aq_banner_polska"
item_state = "aq_banner_polska"
lefthand_file = 'aquila/icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'aquila/icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = null
warcry = "ZA OJCZYZNĘ!"

/obj/item/banner/polski_sztandar/mundane
inspiration_available = FALSE

/datum/crafting_recipe/polski_sztandar
name = "polski sztandar"
result = /obj/item/banner/polski_sztandar/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/color/red = 1,
/obj/item/clothing/under/color/white = 1)
category = CAT_MISC


/////////////////
//Krzyże
//////////////////
/obj/item/wallframe/kszysz
icon = 'aquila/icons/obj/kszysz.dmi'
resistance_flags = FLAMMABLE
force = 0
var/kszysz_type
var/obj/structure/sign/kszysz/kszysz_structure

/obj/item/wallframe/kszysz/kszysz_drewniany
name = "drewniany krzyż"
desc = "Panie, zmiłuj się nad nami"
icon_state = "kszysz_drewn"

/datum/crafting_recipe/kszysz_drewniany
name = "drewniany krzyż"
result = /obj/item/wallframe/kszysz/kszysz_drewniany
time = 5
reqs = list(/obj/item/stack/sheet/mineral/wood = 2)
category = CAT_MISC

/obj/item/wallframe/kszysz/kszysz_zloty
name = "złoty krzyż"
desc = "Panie, zmiłuj się nad nami - ale ze stylem."
icon_state = "kszysz_zloty"

/datum/crafting_recipe/kszysz_zloty
name = "złoty krzyż"
result = /obj/item/wallframe/kszysz/kszysz_zloty
time = 10
reqs = list(/obj/item/stack/sheet/mineral/gold = 1,
/obj/item/stack/sheet/mineral/wood = 2)
category = CAT_MISC

/////////////////
//Godła
//////////////////
/obj/item/wallframe/godlo
icon = 'aquila/icons/obj/godla.dmi'
resistance_flags = FLAMMABLE
force = 0
var/godlo_type
var/obj/structure/sign/godlo/godlo_structure

/obj/item/wallframe/godlo/godlo_drewniane
name = "godło w drewnianej ramie"
desc = "Wizerunek orła białego ze złotą koroną na głowie zwróconej w prawo, z rozwiniętymi skrzydłami, z dziobem i szponami złotymi, umieszczony w czerwonym polu tarczy."
icon_state = "godlo_drewno"

/datum/crafting_recipe/godlo_drewniane
name = "godło w drewnianej ramie"
result = /obj/item/wallframe/godlo/godlo_drewniane
time = 20
reqs = list(/obj/item/stack/sheet/mineral/wood = 4,
/obj/item/clothing/under/color/red = 1,
/obj/item/clothing/under/color/white = 1)
category = CAT_MISC

/obj/item/wallframe/godlo/godlo_czarne
name = "godło w czarnej ramie"
desc = "Wizerunek orła białego ze złotą koroną na głowie zwróconej w prawo, z rozwiniętymi skrzydłami, z dziobem i szponami złotymi, umieszczony w czerwonym polu tarczy."
icon_state = "godlo_czarne"

/datum/crafting_recipe/godlo_czarne
name = "godło w czarnej ramie"
result = /obj/item/wallframe/godlo/godlo_czarne
time = 20
reqs = list(/obj/item/stack/sheet/mineral/wood = 4,
/obj/item/clothing/under/color/red = 1,
/obj/item/clothing/under/color/white = 1)
category = CAT_MISC
21 changes: 21 additions & 0 deletions aquila/code/game/objects/items/storage/commercial.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/obj/item/storage/commercial
resistance_flags = FLAMMABLE

// -----------------------------
// Lidl i Biedronka
// -----------------------------
/obj/item/storage/commercial/reklamowka_biedronka
name = "reklamówka z Biedronki"
icon = 'aquila/icons/obj/storage.dmi'
icon_state = "biedronka"
lefthand_file = 'aquila/icons/mob/inhands/equipment/commercial_lefthand.dmi'
righthand_file = 'aquila/icons/mob/inhands/equipment/commercial_righthand.dmi'
desc = "Foliowa reklamówka z Biedronki"

/obj/item/storage/commercial/reklamowka_lidl
name = "reklamówka z Lidla"
icon = 'aquila/icons/obj/storage.dmi'
icon_state = "lidl"
lefthand_file = 'aquila/icons/mob/inhands/equipment/commercial_lefthand.dmi'
righthand_file = 'aquila/icons/mob/inhands/equipment/commercial_righthand.dmi'
desc = "Foliowa reklamówka z Lidla"
29 changes: 29 additions & 0 deletions aquila/code/game/objects/structures/flags.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/obj/structure/sign/flag
name = "flagbłąd"
desc = "Flaga, która nie jest flagą, a jest błędem. Jeżeli to widzisz, to ktoś zawalił sprawę."
icon = 'aquila/icons/obj/flags.dmi'
icon_state = "empty"

/obj/structure/sign/flag/polska_kotwica
name = "biało-czerwona flaga z kotwicą"
icon_state = "aq_flaga_kotwica"
desc = "Flaga używana przez polskie statki kosmiczne, zgodna z obowiązującym wzorem wymienionym w Załączniku 6 do 'Nanotrasen Military Unit Designation Act'."

/obj/structure/sign/flag_wide // All Signs are 64 by 32 pixels, they take two tiles
name = "flagbłąd"
desc = "Flaga, która nie jest flagą, a jest błędem. Jeżeli to widzisz, to ktoś zawalił sprawę."
icon = 'aquila/icons/obj/flags_64.dmi'
icon_state = "empty"

/obj/structure/sign/flag_wide/polska
name = "Flaga Polski"
icon_state = "aq_flaga_pl_1"
desc = "Flaga używana przez polaków, zgodna z obowiązującym wzorem wymienionym w Załączniku 3 do 'Nanotrasen National Minorities Rights Act'."

/obj/structure/sign/flag_wide/polska_orzel
name = "biało-czerwona flaga z orzełkiem"
icon_state = "aq_flaga_pl_2"
desc = "Flaga używana zwyczajowo przez polaków, niezgodna ze wzorem wymienionym w Załączniku 3 do 'Nanotrasen National Minorities Rights Act'."



8 changes: 8 additions & 0 deletions aquila/code/modules/cargo/packs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,11 @@
contains = list(/obj/machinery/power/rtg)
crate_name = "RTG crate"
crate_type = /obj/structure/closet/crate/engineering/electrical

/datum/supply_pack/misc/maluch
name = "Oryginalny Fiat 126p 'Maluch'"
desc = "Skrzynia zawierająca delikatnie opakowany egzemplarz oryginalnego Fiata 126p zachowanego w perfekcyjnym stanie. Jeden z niewielu jeszce istniejących egzemplarzy."
cost = 69000
contains = list(/obj/vehicle/sealed/car/maluch,
/obj/item/key)
crate_name = "oryginalny Fiat 126p 'Maluch'"
5 changes: 5 additions & 0 deletions aquila/code/modules/clothing/shoes/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
name = "brown laceup shoes"
desc = "The height of fashion, and they're pre-polished!"
icon_state = "brown_laceups"

/obj/item/clothing/shoes/aquila/aq_sandals
name = "sandały"
desc = "Sandały - teraz w zestawie z białymi skarpetkami"
icon_state = "aq_sandals"
Loading
Loading