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

removes the remaining datum redeclares (#25220)

Browse Source 
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
This commit is contained in:
GDN
2024-04-21 18:26:35 +00:00
committed by GitHub
parent f83ef617e9
commit 9e6dcf9c46
53 changed files with 105 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/paicard.dm
+1 -2
View File
@@ -13,6 +13,7 @@
var/looking_for_personality = 0
var/mob/living/silicon/pai/pai
var/list/faction = list("neutral") // The factions the pAI will inherit from the card
var/current_emotion = 1
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
/obj/item/paicard/syndicate
@@ -302,8 +303,6 @@
overlays.Cut()
overlays += "pai-off"
/obj/item/paicard
var/current_emotion = 1
/obj/item/paicard/proc/setEmotion(emotion)
if(pai)
overlays.Cut()
code/game/objects/items/devices/radio/encryptionkey.dm
-11
View File
@@ -148,17 +148,6 @@
icon_state = "com_cypherkey"
channels = list("Command" = 1, "Security" = 1)
/*
/obj/item/encryptionkey/headset_mine
name = "Mining Radio Encryption Key"
icon_state = "mine_cypherkey"
channels = list("Mining" = 1)
/obj/item/encryptionkey/heads/qm
name = "Quartermaster's Encryption Key"
icon_state = "qm_cypherkey"
channels = list("Cargo" = 1, "Mining" = 1)
*/
/obj/item/encryptionkey/headset_cargo
name = "Supply Radio Encryption Key"
icon_state = "cargo_cypherkey"
code/game/objects/items/robot/robot_items.dm
+1
View File
@@ -3,6 +3,7 @@
***********************************************************************/
/obj/item/borg
icon = 'icons/mob/robot_items.dmi'
var/powerneeded // Percentage of power remaining required to run item
/obj/item/borg/stun
name = "electrically-charged arm"
code/game/objects/items/weapons/disks.dm
+1 -1
View File
@@ -67,7 +67,7 @@
/obj/item/storage/box/disks
name = "Diskette Box"
icon_state = "disk_kit"
icon_state = "disk_box"
/obj/item/storage/box/disks/populate_contents()
for(var/i in 1 to 7)
code/game/objects/items/weapons/dna_injector.dm
-23
View File
@@ -209,7 +209,6 @@
name = "DNA injector"
desc = "Good. Let the hate flow through you."
/obj/item/dnainjector/antitele
name = "DNA-Injector (Anti-Tele.)"
desc = "Will make you not able to control your mind."
@@ -553,28 +552,6 @@
block = GLOB.blindblock
..()
/obj/item/dnainjector/telemut
name = "DNA-Injector (Tele.)"
desc = "Super brain man!"
datatype = DNA2_BUF_SE
value = 0xFFF
forcedmutation = TRUE
/obj/item/dnainjector/telemut/Initialize()
block = GLOB.teleblock
..()
/obj/item/dnainjector/antitele
name = "DNA-Injector (Anti-Tele.)"
desc = "Will make you not able to control your mind."
datatype = DNA2_BUF_SE
value = 0x001
forcedmutation = TRUE
/obj/item/dnainjector/antitele/Initialize()
block = GLOB.teleblock
..()
/obj/item/dnainjector/deafmut
name = "DNA-Injector (Deaf)"
desc = "Sorry, what did you say?"
code/game/objects/items/weapons/grenades/clusterbuster.dm
+5 -5
View File
@@ -169,16 +169,16 @@
desc = "No matter what, do not EVER use this."
payload = /obj/singularity
/obj/item/grenade/clusterbuster/tools
name = "\improper Quick Repair Grenade"
desc = "An assistant's every dream."
payload = /obj/random/tool
/obj/item/grenade/clusterbuster/tools
name = "\improper Engineering Deployment Platfom"
desc = "For the that time when gearing up was just too hard."
payload = /obj/random/tech_supply
/obj/item/grenade/clusterbuster/tide
name = "\improper Quick Repair Grenade"
desc = "An assistant's every dream."
payload = /obj/random/tool
/obj/item/grenade/clusterbuster/toys
name = "\improper Toy Delivery System"
desc = "Who needs skill at arcades anyway?"
code/game/objects/items/weapons/storage/boxes.dm
-158
View File
@@ -126,156 +126,6 @@
//////////////////
/* Common Boxes */
//////////////////
/obj/item/storage/box/gloves
name = "box of latex gloves"
desc = "Contains white gloves."
icon_state = "latex"
/obj/item/storage/box/gloves/populate_contents()
for(var/I in 1 to 7)
new /obj/item/clothing/gloves/color/latex(src)
/obj/item/storage/box/masks
name = "sterile masks"
desc = "This box contains masks of sterility."
icon_state = "sterile"
/obj/item/storage/box/masks/populate_contents()
for(var/I in 1 to 7)
new /obj/item/clothing/mask/surgical(src)
/obj/item/storage/box/syringes
name = "syringes"
desc = "A box full of syringes."
desc = "A biohazard alert warning is printed on the box"
icon_state = "syringe"
/obj/item/storage/box/syringes/populate_contents()
for(var/I in 1 to 7)
new /obj/item/reagent_containers/syringe(src)
/obj/item/storage/box/beakers
name = "beaker box"
icon_state = "beaker"
/obj/item/storage/box/beakers/populate_contents()
for(var/I in 1 to 7)
new /obj/item/reagent_containers/glass/beaker(src)
/obj/item/storage/box/beakers/bluespace
name = "box of bluespace beakers"
icon_state = "beaker"
/obj/item/storage/box/beakers/bluespace/populate_contents()
for(var/I in 1 to 7)
new /obj/item/reagent_containers/glass/beaker/bluespace(src)
/obj/item/storage/box/iv_bags
name = "IV Bags"
desc = "A box full of empty IV bags."
icon_state = "beaker"
/obj/item/storage/box/iv_bags/populate_contents()
for(var/I in 1 to 7)
new /obj/item/reagent_containers/iv_bag(src)
/obj/item/storage/box/injectors
name = "\improper DNA injectors"
desc = "This box contains injectors it seems."
/obj/item/storage/box/injectors/populate_contents()
for(var/I in 1 to 6)
new /obj/item/dnainjector/h2m(src)
/obj/item/storage/box/slug
name = "ammunition box (Slug)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "slugbox"
/obj/item/storage/box/slug/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun(src)
/obj/item/storage/box/buck
name = "ammunition box (Buckshot)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "buckshotbox"
/obj/item/storage/box/buck/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/buckshot(src)
/obj/item/storage/box/dragonsbreath
name = "ammunition box (Dragonsbreath)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "dragonsbreathbox"
/obj/item/storage/box/dragonsbreath/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src)
/obj/item/storage/box/stun
name = "ammunition box (Stun shells)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "stunbox"
/obj/item/storage/box/stun/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/stunslug(src)
/obj/item/storage/box/beanbag
name = "ammunition box (Beanbag shells)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "beanbagbox"
/obj/item/storage/box/beanbag/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/beanbag(src)
/obj/item/storage/box/rubbershot
name = "ammunition box (Rubbershot shells)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "rubbershotbox"
/obj/item/storage/box/rubbershot/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/rubbershot(src)
/obj/item/storage/box/tranquilizer
name = "ammunition box (Tranquilizer darts)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "tranqbox"
/obj/item/storage/box/tranquilizer/populate_contents()
for(var/I in 1 to 7)
new /obj/item/ammo_casing/shotgun/tranquilizer(src)
/obj/item/storage/box/flashes
name = "box of flashbulbs"
desc = "<B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
icon_state = "flashbang"
/obj/item/storage/box/flashes/populate_contents()
for(var/I in 1 to 6)
new /obj/item/flash(src)
/obj/item/storage/box/teargas
name = "box of tear gas grenades (WARNING)"
desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness and skin irritation.</B>"
icon_state = "flashbang"
/obj/item/storage/box/teargas/populate_contents()
for(var/I in 1 to 7)
new /obj/item/grenade/chem_grenade/teargas(src)
/obj/item/storage/box/emps
name = "emp grenades"
desc = "A box with 5 emp grenades."
icon_state = "flashbang"
/obj/item/storage/box/emps/populate_contents()
for(var/I in 1 to 5)
new /obj/item/grenade/empgrenade(src)
/obj/item/storage/box/tapes
name = "Tape Box"
@@ -368,14 +218,6 @@
for(var/i in 1 to 7)
new /obj/item/disk/plantgene(src)
/obj/item/storage/box/disks
name = "genetics diskette box"
icon_state = "disk_box"
/obj/item/storage/box/disks/populate_contents()
for(var/i in 1 to 7)
new /obj/item/disk/data(src)
/obj/item/storage/box/PDAs
name = "spare PDAs"
desc = "A box of spare PDA microcomputers."
code/game/objects/items/weapons/twohanded.dm
-7
View File
@@ -401,13 +401,6 @@
mounted_head = null
qdel(src)
/obj/item/spear/kidan
name = "\improper Kidan spear"
desc = "A spear brought over from the Kidan homeworld."
base_icon_state = "kindanspear"
icon_state = "kidanspear0"
// DIY CHAINSAW
/obj/item/chainsaw
name = "chainsaw"