Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

2017-01-20 23:43:35 +01:00

..

autotraitor

AND YOU GET A PARENT CALL AND YOU GET A PARENT CALL AND YOU

2017-01-09 02:31:44 -05:00

blob

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

2017-01-20 23:43:35 +01:00

changeling

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

2017-01-20 23:43:35 +01:00

cult

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

2017-01-20 23:43:35 +01:00

extended

clean up

2016-05-29 22:05:20 -04:00

heist

AND YOU GET A PARENT CALL AND YOU GET A PARENT CALL AND YOU

2017-01-09 02:31:44 -05:00

malfunction

Announcement fixes, change most command announcements to event announcements

2016-10-25 15:21:16 +02:00

meteor

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

miniantags

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

2017-01-20 23:43:35 +01:00

nations

Announcement fixes, change most command announcements to event announcements

2016-10-25 15:21:16 +02:00

nuclear

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

2017-01-20 23:43:35 +01:00

revolution

Switches over to the new system

2017-01-17 13:57:07 +01:00

sandbox

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

shadowling

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

2017-01-20 23:43:35 +01:00

traitor

Switches over to the new system

2017-01-17 13:57:07 +01:00

vampire

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

2017-01-20 23:43:35 +01:00

wizard

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

2017-01-20 23:43:35 +01:00

antag_hud.dm

code'sie has risen

2016-05-29 23:37:40 -04:00

antag_spawner.dm

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

factions.dm

…

game_mode.dm

Tweaks cult datum initialization

2017-01-14 00:02:52 -05:00

gameticker.dm

Fixes karma reminder inversion

2017-01-11 02:25:06 -08:00

intercept_report.dm

Malf AI Rework

2016-08-11 05:16:06 -04:00

objective.dm

Merge pull request #5704 from uraniummeltdown/lingfixesspecies

2017-01-13 15:50:17 -05:00

scoreboard.dm

Adds a wrapper proc that makes the null prefs datum bug not kill talking

2017-01-02 19:26:30 -08:00

setupgame.dm

Tweaks cult datum initialization

2017-01-14 00:02:52 -05:00

steal_items.dm

Deletes old snowflake code

2016-07-31 07:56:09 -07:00