Commit Graph

125 Commits

Author SHA1 Message Date
Markolie
f6c8358fa2 Fix reference to nuke 2015-08-20 21:57:41 +02:00
Markolie
175bea62ca only change alert level on non-syndi nukes 2015-08-20 21:25:07 +02:00
Markolie
4bd4452086 More nuke updates 2015-08-20 19:21:46 +02:00
Markolie
59a86e5711 Make nuclear bomb use wires datum 2015-08-20 18:47:19 +02:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
2015-08-03 00:04:24 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Markolie
80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
Markolie
1db034a8f8 NanoUI synth airlock update 2015-03-03 18:45:22 +01:00
Markolie
1deef3104e NanoUI synth airlock controller 2015-03-03 04:51:32 +01:00
Markolie
c89e3ac1eb Revert "Revert "Emergency communications hotfix""
This reverts commit 3ea36839a8.
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie
71319538df Vending machine overhaul, teleporter area fix, add events to status tab 2015-02-13 15:27:42 +01:00
Markolie
e4defb0202 Autolathe hack fix 2014-12-24 19:15:13 +01:00
Markolie
266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Markolie
2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32:32 +01:00
Markolie
30c1960fe8 Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes 2014-11-23 07:52:38 +01:00
Fox-McCloud
393ba993e2 Syndicate Bomb Port 2014-10-29 04:21:31 -04:00
ZomgPonies
86a4274a3f add_logs runtime fix 2014-06-17 04:19:41 -04:00
ZomgPonies
c5e6f8c070 Runtime fix logging electrifying airlocks 2014-06-17 00:14:04 -04:00
Rob Nelson
55e918cc6a Wire hacking recode from /tg/.
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
ZomgPonies
60994c591d /tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\ 2013-11-10 13:14:22 -05:00