cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports a load of Pigeonverde322 sprites from beestation (#20588)

Browse Source 
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
This commit is contained in:
S34N
2023-03-26 12:11:01 +01:00
committed by GitHub
parent 49520a70fa
commit 5ce5a66c81
22 changed files with 92 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/marker_beacons.dm
+3 -2
View File
@@ -19,7 +19,8 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
singular_name = "marker beacon"
desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger."
icon = 'icons/obj/lighting.dmi'
icon_state = "marker"
icon_state = "markerrandom"
base_icon_state = "marker"
armor = list(MELEE = 50, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 25, BIO = 100, RAD = 100, FIRE = 25, ACID = 0)
max_integrity = 50
merge_type = /obj/item/stack/marker_beacon
@@ -42,7 +43,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
. += "<span class='notice'>Alt-click to select a color. Current color is [picked_color].</span>"
/obj/item/stack/marker_beacon/update_icon_state()
icon_state = "[initial(icon_state)][lowertext(picked_color)]"
icon_state = "[base_icon_state][lowertext(picked_color)]"
/obj/item/stack/marker_beacon/attack_self(mob/user)
if(!isturf(user.loc))
code/modules/mining/ores_coins.dm
+21 -21
View File
@@ -7,7 +7,7 @@
/obj/item/stack/ore
name = "rock"
icon = 'icons/obj/mining.dmi'
icon = 'icons/obj/stacks/ores.dmi'
icon_state = "ore"
max_amount = 50
singular_name = "ore chunk"
@@ -71,8 +71,8 @@
/obj/item/stack/ore/uranium
name = "uranium ore"
icon_state = "Uranium ore"
item_state = "Uranium ore"
icon_state = "uranium_ore"
item_state = "uranium_ore"
origin_tech = "materials=5"
singular_name = "uranium ore chunk"
points = 30
@@ -81,8 +81,8 @@
/obj/item/stack/ore/iron
name = "iron ore"
icon_state = "Iron ore"
item_state = "Iron ore"
icon_state = "iron_ore"
item_state = "iron_ore"
origin_tech = "materials=1"
singular_name = "iron ore chunk"
points = 1
@@ -91,8 +91,8 @@
/obj/item/stack/ore/glass
name = "sand pile"
icon_state = "Glass ore"
item_state = "Glass ore"
icon_state = "sand"
item_state = "sand"
origin_tech = "materials=1"
singular_name = "sand pile"
points = 1
@@ -146,8 +146,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/plasma
name = "plasma ore"
icon_state = "Plasma ore"
item_state = "Plasma ore"
icon_state = "plasma_ore"
item_state = "plasma_ore"
origin_tech = "plasmatech=2;materials=2"
singular_name = "plasma ore chunk"
points = 15
@@ -156,8 +156,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/silver
name = "silver ore"
icon_state = "Silver ore"
item_state = "Silver ore"
icon_state = "silver_ore"
item_state = "silver_ore"
origin_tech = "materials=3"
singular_name = "silver ore chunk"
points = 16
@@ -166,8 +166,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/gold
name = "gold ore"
icon_state = "Gold ore"
item_state = "Gold ore"
icon_state = "gold_ore"
item_state = "gold_ore"
origin_tech = "materials=4"
singular_name = "gold ore chunk"
points = 18
@@ -176,8 +176,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/diamond
name = "diamond ore"
icon_state = "Diamond ore"
item_state = "Diamond ore"
icon_state = "diamond_ore"
item_state = "diamond_ore"
origin_tech = "materials=6"
singular_name = "diamond ore chunk"
points = 50
@@ -186,8 +186,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/bananium
name = "bananium ore"
icon_state = "Clown ore"
item_state = "Clown ore"
icon_state = "bananium_ore"
item_state = "bananium_ore"
origin_tech = "materials=4"
singular_name = "bananium ore chunk"
points = 60
@@ -196,8 +196,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/tranquillite
name = "tranquillite ore"
icon_state = "Mime ore"
item_state = "Mime ore"
icon_state = "tranquillite_ore"
item_state = "tranquillite_ore"
origin_tech = "materials=4"
singular_name = "transquillite ore chunk"
points = 60
@@ -206,8 +206,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/titanium
name = "titanium ore"
icon_state = "Titanium ore"
item_state = "Titanium ore"
icon_state = "titanium_ore"
item_state = "titanium_ore"
singular_name = "titanium ore chunk"
points = 50
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)