cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict and adds chomp comments to vorespawn_blacklist

Browse Source
This commit is contained in:
Razgriz
2021-02-01 18:45:13 -07:00
committed by GitHub
parent d3c7cc6040
commit e414b036ab
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/vore/eating/vorepanel_vr.dm
View File

@@ -158,7 +158,7 @@
"belly_fullscreen" = selected.belly_fullscreen, "belly_fullscreen" = selected.belly_fullscreen,
"possible_fullscreens" = icon_states('icons/mob/screen_full_vore.dmi'), "possible_fullscreens" = icon_states('icons/mob/screen_full_vore.dmi'),
"vorespawn_blacklist" = selected.vorespawn_blacklist "vorespawn_blacklist" = selected.vorespawn_blacklist
) ) //CHOMP Addition: vorespawn blacklist
data["selected"]["addons"] = list() data["selected"]["addons"] = list()
for(var/flag_name in selected.mode_flag_list) for(var/flag_name in selected.mode_flag_list)
@@ -929,16 +929,11 @@
qdel(host.vore_selected) qdel(host.vore_selected)
host.vore_selected = host.vore_organs[1] host.vore_selected = host.vore_organs[1]
. = TRUE . = TRUE
<<<<<<< HEAD
if("b_vorespawn_blacklist") if("b_vorespawn_blacklist") //CHOMP Addition
host.vore_selected.vorespawn_blacklist = !host.vore_selected.vorespawn_blacklist host.vore_selected.vorespawn_blacklist = !host.vore_selected.vorespawn_blacklist
. = TRUE . = TRUE
||||||| parent of 5dd99a1257... Merge pull request #9622 from Verkister/eastercameearly
=======
>>>>>>> 5dd99a1257... Merge pull request #9622 from Verkister/eastercameearly
if(.) if(.)
unsaved_changes = TRUE unsaved_changes = TRUE
@@ -1113,4 +1108,4 @@
if(new_message) if(new_message)
host.vore_selected.set_reagent_messages(new_message,"full5") host.vore_selected.set_reagent_messages(new_message,"full5")
. = TRUE . = TRUE
//CHOMPedit end //CHOMPedit end