cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution Part One

Browse Source
This commit is contained in:
Unknown
2019-04-28 22:14:31 -04:00
parent 3c48a14f02
commit 1f9eb87849
2 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/recharger.dm
View File

@@ -8,11 +8,7 @@ obj/machinery/recharger
idle_power_usage = 4
active_power_usage = 40000 //40 kW
var/obj/item/charging = null
<<<<<<< HEAD
var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/ammo_casing/nsfw_batt) //VOREStation Add - NSFW Batteries
=======
var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash)
>>>>>>> 2baef09... Merge pull request #6031 from Novacat/spriteadd
var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/modular_computer, /obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/device/flash, /obj/item/ammo_casing/nsfw_batt) //VOREStation Add - NSFW Batteries
var/icon_state_charged = "recharger2"
var/icon_state_charging = "recharger1"
var/icon_state_idle = "recharger0" //also when unpowered
@@ -48,16 +44,13 @@ obj/machinery/recharger
if(E.self_recharge)
to_chat(user, "<span class='notice'>Your gun has no recharge port.</span>")
return
<<<<<<< HEAD
if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/nsfw_batt)) //VOREStation Edit: NSFW charging
=======
if(istype(G, /obj/item/modular_computer))
var/obj/item/modular_computer/C = G
if(!C.battery_module)
to_chat(user, "This device does not have a battery installed.")
return
else if(!G.get_cell())
>>>>>>> 2baef09... Merge pull request #6031 from Novacat/spriteadd
to_chat(user, "This device does not have a battery installed.")
return

41
vorestation.dme
View File

@@ -795,41 +795,8 @@
#include "code\game\machinery\computer\station_alert.dm"
#include "code\game\machinery\computer\supply.dm"
#include "code\game\machinery\computer\syndicate_specops_shuttle.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\game\machinery\computer\timeclock_vr.dm"
#include "code\game\machinery\computer\~computer_vr.dm"
#include "code\game\machinery\computer3\bios.dm"
#include "code\game\machinery\computer3\buildandrepair.dm"
#include "code\game\machinery\computer3\component.dm"
#include "code\game\machinery\computer3\computer.dm"
#include "code\game\machinery\computer3\computer3_notes.dm"
#include "code\game\machinery\computer3\file.dm"
#include "code\game\machinery\computer3\laptop.dm"
#include "code\game\machinery\computer3\lapvend.dm"
#include "code\game\machinery\computer3\networking.dm"
#include "code\game\machinery\computer3\NTOS.dm"
#include "code\game\machinery\computer3\program.dm"
#include "code\game\machinery\computer3\program_disks.dm"
#include "code\game\machinery\computer3\server.dm"
#include "code\game\machinery\computer3\storage.dm"
#include "code\game\machinery\computer3\computers\arcade.dm"
#include "code\game\machinery\computer3\computers\atmos_alert.dm"
#include "code\game\machinery\computer3\computers\camera.dm"
#include "code\game\machinery\computer3\computers\card.dm"
#include "code\game\machinery\computer3\computers\communications.dm"
#include "code\game\machinery\computer3\computers\crew.dm"
#include "code\game\machinery\computer3\computers\customs.dm"
#include "code\game\machinery\computer3\computers\HolodeckControl.dm"
#include "code\game\machinery\computer3\computers\law.dm"
#include "code\game\machinery\computer3\computers\medical.dm"
#include "code\game\machinery\computer3\computers\Operating.dm"
#include "code\game\machinery\computer3\computers\power.dm"
#include "code\game\machinery\computer3\computers\prisoner.dm"
#include "code\game\machinery\computer3\computers\robot.dm"
#include "code\game\machinery\computer3\computers\security.dm"
#include "code\game\machinery\computer3\computers\welcome.dm"
=======
>>>>>>> 2baef09... Merge pull request #6031 from Novacat/spriteadd:polaris.dme
#include "code\game\machinery\doors\airlock.dm"
#include "code\game\machinery\doors\airlock_control.dm"
#include "code\game\machinery\doors\airlock_electronics.dm"
@@ -2454,9 +2421,7 @@
#include "code\modules\mob\new_player\preferences_setup_vr.dm"
#include "code\modules\mob\new_player\skill.dm"
#include "code\modules\mob\new_player\sprite_accessories.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\mob\new_player\sprite_accessories_vr.dm"
=======
#include "code\modules\modular_computers\laptop_vendor.dm"
#include "code\modules\modular_computers\computers\modular_computer\core.dm"
#include "code\modules\modular_computers\computers\modular_computer\damage.dm"
@@ -2517,7 +2482,6 @@
#include "code\modules\modular_computers\NTNet\emails\email_account.dm"
#include "code\modules\modular_computers\NTNet\emails\email_message.dm"
#include "code\modules\modular_computers\NTNet\NTNRC\conversation.dm"
>>>>>>> 2baef09... Merge pull request #6031 from Novacat/spriteadd:polaris.dme
#include "code\modules\multiz\_stubs.dm"
#include "code\modules\multiz\basic.dm"
#include "code\modules\multiz\hoist.dm"
@@ -2551,9 +2515,6 @@
#include "code\modules\nano\modules\human_appearance.dm"
#include "code\modules\nano\modules\law_manager.dm"
#include "code\modules\nano\modules\nano_module.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\nano\modules\power_monitor.dm"
#include "code\modules\nano\modules\rcon.dm"
#include "code\modules\nifsoft\nif.dm"
#include "code\modules\nifsoft\nif_softshop.dm"
#include "code\modules\nifsoft\nif_statpanel.dm"
@@ -2565,8 +2526,6 @@
#include "code\modules\nifsoft\software\13_soulcatcher.dm"
#include "code\modules\nifsoft\software\14_commlink.dm"
#include "code\modules\nifsoft\software\15_misc.dm"
=======
>>>>>>> 2baef09... Merge pull request #6031 from Novacat/spriteadd:polaris.dme
#include "code\modules\organs\blood.dm"
#include "code\modules\organs\misc.dm"
#include "code\modules\organs\organ.dm"