diff --git a/_maps/vonneumann.json b/_maps/vonneumann.json index fbb68a5a32e..712effe8995 100644 --- a/_maps/vonneumann.json +++ b/_maps/vonneumann.json @@ -29,7 +29,7 @@ "Missile Array", "2 light fighters", "Advanced Gas Cooled Nuclear Reactor", - "Turing Drive", + "Thirring Drive", "Thermoelectric Generator" ] } diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 7df88b99f5a..e590b9f193d 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -27,7 +27,7 @@ /obj/item/gun/energy/e_gun/mini/heads name = "Personal Tiny Self Defense Gun" - desc = "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Solgov. It has two settings: disable and kill." + desc = "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Solgov. It has two settings: disable and kill." //NSV13 change Nanotrasen to Solgov ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser) ///uses the hos disabler rounds to slightly weaken the disabler count and also to avoid encountering a visual bug where the gun is out of charge but displays that it has one enough for another shot. selfcharge = 1 charge_delay = 20 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 5edfa32d2e7..1a6baa4a841 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -19,7 +19,7 @@ /obj/item/gun/energy/laser/retro name ="retro laser gun" icon_state = "retro" - desc = "A modern lasergun, used by Solgov's private security or military forces. it is quite deadly and easy to maintain, making it a favorite." + desc = "A modern lasergun, used by Solgov's private security or military forces. it is quite deadly and easy to maintain, making it a favorite." //NSV13 changed description ammo_x_offset = 3 /obj/item/gun/energy/laser/retro/old diff --git a/config/maps.txt b/config/maps.txt index d9892a2fbff..130b3346bce 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -64,7 +64,6 @@ map snake endmap map vonneumann - minplayers 3 maxplayers 30 votable endmap diff --git a/nsv13.dme b/nsv13.dme index 659f315cc74..2abd39ff698 100644 --- a/nsv13.dme +++ b/nsv13.dme @@ -4063,7 +4063,6 @@ #include "nsv13\code\modules\power\lighting.dm" #include "nsv13\code\modules\power\power.dm" #include "nsv13\code\modules\power\stormdrive.dm" -#include "nsv13\code\modules\power\supercollector.dm" #include "nsv13\code\modules\power\multicellcharger\multi_cell_charger.dm" #include "nsv13\code\modules\power\reactor\control_rods.dm" #include "nsv13\code\modules\power\reactor\fuel_rods.dm"