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

Feat: ID card skins DLC #695

Merged
merged 34 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8b4e7b5
Yeah yeah
AyIong Nov 13, 2023
000a90f
More skins and code improvements
AyIong Nov 14, 2023
3851858
Rainbow
AyIong Nov 14, 2023
72920c0
Simple guest pass check
AyIong Nov 14, 2023
65da7db
DENIED
AyIong Nov 14, 2023
da221c7
Update id_skins.dmi
AyIong Nov 14, 2023
984ea9f
Metal colored skin and some code improvements
AyIong Nov 14, 2023
f699241
Business card and transfer module
AyIong Nov 14, 2023
e04a027
Space & Kitty skins
AyIong Nov 14, 2023
c52932c
Kitty colored and some tweaks
AyIong Nov 14, 2023
3271977
Neon skin
AyIong Nov 15, 2023
167d3d0
Neon update
AyIong Nov 15, 2023
04e2d83
+1 -1
AyIong Nov 15, 2023
96d80d2
Donor
AyIong Nov 15, 2023
0971777
Cargo crate & spawner
AyIong Nov 15, 2023
8b73690
Maps
AyIong Nov 15, 2023
0561e75
Fix cargo crate
AyIong Nov 15, 2023
e2d743c
Spellcheck
AyIong Nov 15, 2023
5bfdfb2
Another cargo crate fix
AyIong Nov 15, 2023
cb691eb
Random pos
AyIong Nov 15, 2023
a877b30
Review changes №1
AyIong Nov 15, 2023
8f79b8f
Whoops x2
AyIong Nov 15, 2023
6f9bbb3
Review Changes №2
AyIong Nov 16, 2023
ac7cdcd
Move removing to proc
AyIong Nov 16, 2023
08eedb5
Update card_skins.dm
AyIong Nov 16, 2023
93bd72d
Review Changes №3
AyIong Nov 16, 2023
a3f6c28
Review Changes №4
AyIong Nov 16, 2023
e4ea3d9
Trait
AyIong Nov 16, 2023
30a3033
qdel
AyIong Nov 16, 2023
27d23bb
Update card_skins.dm
AyIong Nov 16, 2023
496a7a5
SUKA
AyIong Nov 16, 2023
597ff34
I hope that's done
AyIong Nov 16, 2023
60046d3
Update modular_ss220/objects/code/card_skins.dm
AyIong Nov 17, 2023
02f201c
List transfer
AyIong Nov 17, 2023
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
8 changes: 4 additions & 4 deletions _maps/map_files220/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4455,6 +4455,7 @@
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet/crate,
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/random_spawners/id_skins/no_chance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"azj" = (
Expand Down Expand Up @@ -10963,10 +10964,7 @@
/area/station/public/locker)
"aVT" = (
/obj/structure/table,
/obj/item/clothing/head/soft/grey{
pixel_x = -2;
pixel_y = 3
},
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"aVU" = (
Expand Down Expand Up @@ -24001,6 +23999,7 @@
/area/station/hallway/secondary/garden)
"bHo" = (
/obj/effect/decal/cleanable/vomit,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"bHp" = (
Expand Down Expand Up @@ -41037,6 +41036,7 @@
req_access_txt = "25"
},
/obj/machinery/light_switch/north,
/obj/effect/spawner/random_spawners/id_skins/no_chance,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
"cOB" = (
Expand Down
3 changes: 3 additions & 0 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -50567,6 +50567,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
"fwy" = (
Expand Down Expand Up @@ -79790,6 +79791,7 @@
/obj/item/clothing/under/color/grey,
/obj/item/clothing/under/color/grey,
/obj/machinery/light_construct/small/north,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/wood/fancy/birch,
/area/station/maintenance/fsmaint)
"qgz" = (
Expand Down Expand Up @@ -85525,6 +85527,7 @@
req_one_access_txt = "33;41"
},
/mob/living/simple_animal/hostile/scarybat,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plasteel{
icon_state = "vault"
},
Expand Down
32 changes: 20 additions & 12 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3408,6 +3408,7 @@
},
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -29589,15 +29590,10 @@
},
/area/station/public/locker)
"cxt" = (
/obj/structure/table,
/obj/item/storage/briefcase{
pixel_x = 4;
pixel_y = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/public/locker)
/obj/structure/table/wood/poker,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plasteel/grimy,
/area/station/maintenance/abandonedbar)
"cxw" = (
/obj/structure/closet/wardrobe/green,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -29980,6 +29976,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/storage/briefcase{
pixel_x = 4;
pixel_y = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
Expand Down Expand Up @@ -69409,6 +69409,13 @@
/obj/machinery/economy/vending/coffee,
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
"mbV" = (
/obj/structure/table,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/public/locker)
"mbY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
Expand Down Expand Up @@ -101585,6 +101592,7 @@
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/id_skins,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"xlZ" = (
Expand Down Expand Up @@ -123727,7 +123735,7 @@ yeh
dcM
daf
lTi
dhv
cxt
lYq
dYm
lTi
Expand Down Expand Up @@ -151200,7 +151208,7 @@ lgO
ctp
xKs
crW
cxs
mbV
cyO
crJ
cBQ
Expand Down Expand Up @@ -151457,7 +151465,7 @@ uKK
ctq
cuA
crW
cxt
cxs
cyP
crW
cBT
Expand Down
90 changes: 90 additions & 0 deletions modular_ss220/loadout/code/donor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,93 @@
display_name = "Медицинский анализатор"
path = /obj/item/healthanalyzer
cost = 2

// ID Skins
/datum/gear/donor/id_decal_colored
display_name = "Наклейка на карту (Голографическая)"
path = /obj/item/id_skin/colored
cost = 2

/datum/gear/donor/id_decal_silver_colored
display_name = "Серебрянная наклейка на карту (Голографическая)"
path = /obj/item/id_skin/silver/colored
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_silver
display_name = "Серебрянная наклейка на карту"
path = /obj/item/id_skin/silver
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_gold
display_name = "Золотая наклейка на карту"
path = /obj/item/id_skin/gold
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_business
display_name = "Бизнесменская наклейка на карту"
path = /obj/item/id_skin/business
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_lifetime
display_name = "Стильная наклейка на карту"
path = /obj/item/id_skin/lifetime
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_ussp
display_name = "Коммунистическая наклейка на карту"
path = /obj/item/id_skin/ussp
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_clown
display_name = "Клоунская наклейка на карту"
path = /obj/item/id_skin/clown
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_neon
display_name = "Неоновая наклейка на карту"
path = /obj/item/id_skin/neon
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_neon_colored
display_name = "Неоновая наклейка на карту (Голографическая)"
path = /obj/item/id_skin/neon/colored
donator_tier = 3
cost = 2

/datum/gear/donor/id_decal_rainbow
display_name = "Радужная наклейка на карту"
path = /obj/item/id_skin/rainbow
donator_tier = 4
cost = 3

/datum/gear/donor/id_decal_space
display_name = "КОСМИЧЕСКАЯ наклейка на карту"
path = /obj/item/id_skin/space
donator_tier = 4
cost = 3

/datum/gear/donor/id_decal_kitty
display_name = "Кото-клейка на карту"
path = /obj/item/id_skin/kitty
donator_tier = 4
cost = 3

/datum/gear/donor/id_decal_kitty_colored
display_name = "Кото-клейка на карту (Голографическая)"
path = /obj/item/id_skin/kitty/colored
donator_tier = 4
cost = 3

/datum/gear/donor/id_decal_snake
display_name = "Бегущая наклейка на карту"
path = /obj/item/id_skin/snake
donator_tier = 4
cost = 3
Binary file modified modular_ss220/maps220/icons/spawner_icons.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions modular_ss220/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "code/beretta.dm"
#include "code/big_bed.dm"
#include "code/billboard.dm"
#include "code/card_skins.dm"
#include "code/closets.dm"
#include "code/mattress.dm"
#include "code/miscellaneous.dm"
Expand Down
Loading
Loading