diff -i smaug14/src/deity.c smaug18/src/deity.c
8c8
<  * Tricops and Fireblade                                      |             *
---
>  * Tricops, Fireblade, Edmond, Conran                         |             *
138a139
> 
375a377
>       char buf[MAX_STRING_LENGTH];
820d821
< 
865a867,912
>       if ( !str_cmp( arg2, "delete" ) )
>               /*
>                * Remove the deity from all online players - everything under the IF
>                * statement is a copy from do_devote for "none" so we remove all affects
>                */
>       {
>               CHAR_DATA *vch;
> 
>               for ( vch = first_char; vch; vch = vch->next )
>               {
>                       set_char_color( AT_RED, vch );
>                       if ( !IS_NPC( vch ) )
>                       {
>                               if ( vch->pcdata->deity == deity )
>                               {
>                                       sprintf( buf, "&R\n\rYour deity, %s, has met its demise!\n\r", vch->pcdata->deity_name );
>                                       if ( !vch->desc )
>                                               add_loginmsg( vch->name, 18, buf );
>                                       else
>                                               send_to_char_color( buf, vch );
>                                       xREMOVE_BITS( vch->affected_by, vch->pcdata->deity->affected );
>                                       REMOVE_BIT( vch->resistant, vch->pcdata->deity->element );
>                                       REMOVE_BIT( vch->susceptible, vch->pcdata->deity->suscept );
>                                       vch->pcdata->deity = NULL;
>                                       STRFREE( vch->pcdata->deity_name );
>                                       vch->pcdata->deity_name = STRALLOC( "" );
>                                       save_char_obj( vch );
>                               }
>                       }
>               }
>               /*
>                * Delete the deity from the list in the deity.lst file and save 
>                */
>               UNLINK( deity, first_deity, last_deity, next, prev );
>               write_deity_list(  );
>               send_to_char( "Deity deleted.\n\r", ch );
>               /*
>                * Dispose the deity from memory 
>                */
>               STRFREE( deity->name );
>               STRFREE( deity->filename );
>               STRFREE( deity->description );
>               DISPOSE( deity );
>               return;
>       }
> 
1138c1185
<       if ( !str_cmp( arg, "corpse" ) && !IS_PKILL( ch ) )
---
>       if ( !str_cmp( arg, "corpse" ) )
1143a1191
>               bool retr = FALSE;
1151c1199
<               if ( IS_SET( ch->in_room->room_flags, ROOM_CLANSTOREROOM ) )
---
>               if ( xIS_SET( ch->in_room->room_flags, ROOM_CLANSTOREROOM ) )
1165c1213,1221
<                               if ( IS_SET( obj->in_room->room_flags, ROOM_NOSUPPLICATE ) )
---
>                               if ( IS_PKILL( ch ) && obj->timer > 19 )
>                               {
>                                       if ( retr )
>                                               ch->pcdata->favor -= ch->pcdata->deity->scorpse;
>                                       send_to_char( "So soon?  Have patience...\n\r", ch );
>                                       return;
>                               }
> 
>                               if ( xIS_SET( obj->in_room->room_flags, ROOM_NOSUPPLICATE ) )
1175a1232,1236
>                               /*
>                                * what kinda deity doesn't unbury your corpse? :P  Eddy 
>                                */
>                               if ( IS_OBJ_STAT( obj, ITEM_BURIED ) )
>                                       xREMOVE_BIT( obj->extra_flags, ITEM_BURIED );
1176a1238
>                               retr = TRUE;
1348c1410,1411
<               if ( IS_SET( ch->in_room->room_flags, ROOM_NOSUPPLICATE ) )
---
>               if ( xIS_SET( ch->in_room->room_flags, ROOM_NOSUPPLICATE )
>                       || xIS_SET( ch->in_room->room_flags, ROOM_NS_RECALL ) )