cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-04-06 14:47:21 -04:00
parent 1d59d8683c
commit c4860391b6
4 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/unsorted.dm
View File

@@ -1549,9 +1549,6 @@ var/mob/dview/dview_mob = new
/proc/IsValidSrc(datum/D)
if(istype(D))
return !QDELETED(D)
<<<<<<< HEAD
return FALSE
=======
return FALSE
//gives us the stack trace from CRASH() without ending the current proc.
@@ -1574,4 +1571,3 @@ var/mob/dview/dview_mob = new
else
return "\[[url_encode(thing.tag)]\]"
return "\ref[input]"
>>>>>>> 6a2cd30... Replaces AI-controlled Maint Drones with AI-controlled Borg Shells (#6025)

15
code/game/objects/items/robot/robot_upgrades.dm
View File

@@ -25,24 +25,9 @@
require_module = 1
/obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
<<<<<<< HEAD
if(..()) return 0
R.transform_with_anim() //VOREStation edit: sprite animation
R.uneq_all()
R.modtype = initial(R.modtype)
R.hands.icon_state = initial(R.hands.icon_state)
R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name)
R.module.Reset(R)
qdel(R.module)
R.module = null
R.updatename("Default")
=======
if(..())
return 0
R.module_reset()
>>>>>>> 6a2cd30... Replaces AI-controlled Maint Drones with AI-controlled Borg Shells (#6025)
return 1
/obj/item/borg/upgrade/rename

4
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -665,6 +665,7 @@
return ..()
/mob/living/silicon/robot/proc/module_reset()
transform_with_anim() //VOREStation edit: sprite animation
uneq_all()
modtype = initial(modtype)
hands.icon_state = initial(hands.icon_state)
@@ -991,20 +992,17 @@
icontype = module_sprites[1]
else
icontype = input("Select an icon! [triesleft ? "You have [triesleft] more chance\s." : "This is your last try."]", "Robot Icon", icontype, null) in module_sprites
<<<<<<< HEAD
if(notransform) //VOREStation edit start: sprite animation
to_chat(src, "Your current transformation has not finished yet!")
choose_icon(icon_selection_tries, module_sprites)
return
else
transform_with_anim() //VOREStation edit end: sprite animation
=======
if(icontype == "Custom")
icon = CUSTOM_ITEM_SYNTH
else // This is to fix an issue where someone with a custom borg sprite chooses a non-custom sprite and turns invisible.
icon = 'icons/mob/robots.dmi'
>>>>>>> 6a2cd30... Replaces AI-controlled Maint Drones with AI-controlled Borg Shells (#6025)
icon_state = module_sprites[icontype]
updateicon()

10
vorestation.dme
View File

@@ -2237,11 +2237,8 @@
#include "code\modules\mob\living\silicon\subystems.dm"
#include "code\modules\mob\living\silicon\ai\ai.dm"
#include "code\modules\mob\living\silicon\ai\ai_movement.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mob\living\silicon\ai\ai_vr.dm"
=======
#include "code\modules\mob\living\silicon\ai\ai_remote_control.dm"
>>>>>>> 6a2cd30... Replaces AI-controlled Maint Drones with AI-controlled Borg Shells (#6025):polaris.dme
#include "code\modules\mob\living\silicon\ai\ai_vr.dm"
#include "code\modules\mob\living\silicon\ai\death.dm"
#include "code\modules\mob\living\silicon\ai\examine.dm"
#include "code\modules\mob\living\silicon\ai\icons.dm"
@@ -2282,14 +2279,11 @@
#include "code\modules\mob\living\silicon\robot\robot_damage.dm"
#include "code\modules\mob\living\silicon\robot\robot_items.dm"
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mob\living\silicon\robot\robot_remote_control.dm"
#include "code\modules\mob\living\silicon\robot\robot_vr.dm"
#include "code\modules\mob\living\silicon\robot\syndicate.dm"
#include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm"
#include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm"
=======
#include "code\modules\mob\living\silicon\robot\robot_remote_control.dm"
>>>>>>> 6a2cd30... Replaces AI-controlled Maint Drones with AI-controlled Borg Shells (#6025):polaris.dme
#include "code\modules\mob\living\silicon\robot\drone\drone.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_console.dm"