cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates a couple of /obj/item variables (#29829)

Browse Source 
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
This commit is contained in:
kyunkyunkyun
2025-09-14 15:23:56 +00:00
committed by GitHub
parent 500c6b16fe
commit 8821ab9a66
418 changed files with 1750 additions and 3810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+10 -4
View File
@@ -3253,16 +3253,22 @@
continue
W.icon = 'icons/obj/guns/projectile.dmi'
W.icon_state = "revolver"
W.item_state = "gun"
W.worn_icon_state = "gun"
W.inhand_icon_state = "gun"
W.lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
W.righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
message_admins("[key_name_admin(usr)] made every item look like a gun")
if("schoolgirl") // nyaa~ How much are you paying attention in reviews?
if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes")
return
SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Chinese Cartoons")
for(var/obj/item/clothing/under/W in world)
W.icon_state = "schoolgirl"
W.item_state = "w_suit"
W.item_color = "schoolgirl"
W.icon_state = /obj/item/clothing/under/dress/schoolgirl::icon_state
W.worn_icon = /obj/item/clothing/under/dress/schoolgirl::worn_icon
W.sprite_sheets = /obj/item/clothing/under/dress/schoolgirl::sprite_sheets
W.worn_icon_state = /obj/item/clothing/under/dress/schoolgirl::worn_icon_state
W.inhand_icon_state = /obj/item/clothing/under/dress/schoolgirl::inhand_icon_state
W.item_color = /obj/item/clothing/under/dress/schoolgirl::item_color
message_admins("[key_name_admin(usr)] activated Japanese Animes mode")
SEND_SOUND(world, sound('sound/AI/animes.ogg'))
if("eagles")//SCRAW
code/modules/admin/verbs/BrokenInhands.dm
+5 -5
View File
@@ -12,10 +12,10 @@
var/list/Rstates = IR.IconStates()
var/icon/J = new(O.icon)
var/list/istates = J.IconStates()
if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.item_state))
if(!Lstates.Find(O.icon_state) && !Lstates.Find(O.inhand_icon_state))
if(O.icon_state)
text += "[O.type] is missing left hand icon called \"[O.icon_state]\".\n"
if(!Rstates.Find(O.icon_state) && !Rstates.Find(O.item_state))
if(!Rstates.Find(O.icon_state) && !Rstates.Find(O.inhand_icon_state))
if(O.icon_state)
text += "[O.type] is missing right hand icon called \"[O.icon_state]\".\n"
@@ -23,9 +23,9 @@
if(O.icon_state)
if(!istates.Find(O.icon_state))
text += "[O.type] is missing normal icon called \"[O.icon_state]\" in \"[O.icon]\".\n"
//if(O.item_state)
// if(!istates.Find(O.item_state))
// text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
//if(O.inhand_icon_state)
// if(!istates.Find(O.inhand_icon_state))
// text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.inhand_icon_state]\" IN \"[O.icon]\"\n"
//text+="\n"
qdel(O)
if(text)
code/modules/admin/verbs/onlyoneteam.dm
+1 -1
View File
@@ -66,7 +66,7 @@
desc = "Used for playing the most violent and degrading of childhood games."
icon = 'icons/obj/basketball.dmi'
icon_state = "dodgeball"
item_state = "dodgeball"
inhand_icon_state = "dodgeball"
dribbleable = TRUE
/obj/item/beach_ball/dodgeball_team/throw_impact(atom/hit_atom)