DZD 0965789925 Fix merge conflicts

2015-08-21 18:38:42 -04:00

..

autotraitor

…

blob

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

borer

Changes a few del to del()

2015-07-10 23:28:08 -04:00

changeling

Merge pull request #1760 from Markolie/ipcmasterrace

2015-08-19 11:57:04 -04:00

cult

Merge pull request #1778 from Markolie/events

2015-08-19 17:04:14 -04:00

epidemic

…

events

Merge pull request #1778 from Markolie/events

2015-08-19 17:04:14 -04:00

extended

…

heist

Vox heist left behind fix 2, robot checks for APC's/alarms

2015-08-14 06:38:51 +02:00

malfunction

Replace disabling RCD's with exploding them

2015-08-20 01:29:23 +02:00

meme

…

meteor

Makes Cables GC Better

2015-07-08 09:30:03 -04:00

mutiny

Merge pull request #1781 from Markolie/adminbus

2015-08-18 20:19:55 -04:00

nations

Merge pull request #1781 from Markolie/adminbus

2015-08-18 20:19:55 -04:00

nuclear

only change alert level on non-syndi nukes

2015-08-20 21:25:07 +02:00

revolution

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

sandbox

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

shadowling

Shadowling dethrall fix

2015-08-20 11:42:09 -04:00

traitor

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

vampire

Merge pull request #1740 from tigercat2000/underwear_refactor

2015-08-17 17:37:50 +02:00

wizard

Fix merge conflicts

2015-08-21 18:38:42 -04:00

xenos

Add option to request nuke code to consoles (from /tg/)

2015-08-14 20:43:20 +02:00

antag_spawner.dm

Changes

2015-08-06 01:56:59 -04:00

events.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

2015-08-18 18:38:59 +02:00

factions.dm

…

game_mode.dm

isNonCrewAntag() checks, key_name fixes

2015-08-20 17:25:55 +02:00

gameticker.dm

Fix traitor end of round message

2015-08-10 20:00:53 +02:00

intercept_report.dm

…

newobjective.dm

Merge pull request #1604 from TheDZD/helper

2015-08-03 17:44:01 -04:00

objective.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

scoreboard.dm

Fix traitor end of round message

2015-08-10 20:00:53 +02:00

setupgame.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

steal_items.dm

Drill and drone fixes

2015-08-01 10:13:54 -04:00