Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Kyep
9f20cb1685
Fixes merge conflict in event_container
2017-02-10 22:07:05 -08:00
Markolie
f2497afd9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# _maps/map_files/cyberiad/z2.dmm
# code/__DEFINES/is_helpers.dm
# code/__DEFINES/misc.dm
# code/_globalvars/lists/objects.dm
# code/modules/mob/living/living_defines.dm
# icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
Markolie
a06c997629
Add Station Goals
...
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
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
Kyep
e5ab12acd0
PR 2 Creation
2017-01-07 00:18:43 -08:00
Markolie
f4c4bfe288
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__HELPERS/unsorted.dm
# code/_globalvars/lists/objects.dm
# code/controllers/verbs.dm
# code/game/gamemodes/cult/ritual.dm
# code/game/gamemodes/cult/runes.dm
# code/game/objects/items/stacks/sheets/sheet_types.dm
# code/modules/mob/spirit/mask/mask.dm
# code/modules/mob/spirit/viewpoint.dm
# icons/effects/96x96.dmi
# icons/effects/effects.dmi
# icons/mob/actions.dmi
# icons/obj/weapons.dmi
# icons/obj/wizard.dmi
# icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Markolie
1f243ec4f0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
Markolie
b3f505175e
Announcement refactor
2016-10-24 22:03:18 +02:00
Markolie
2e711d1337
Lay groundwork for megafauna, and add Ashdragon.
...
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
FalseIncarnate
78d311d20a
Nano-Mob Hunter GO! WIP commit
2016-09-03 02:25:53 -04:00
Fox-McCloud
41a74fb865
Malf AI Rework
2016-08-11 05:16:06 -04:00
Fox-McCloud
8cd140e48a
Adds in Fast Processing
2016-08-09 06:55:00 -04:00
SamCroswell
0466499f86
Personal Crafting - Initial Commit
2016-07-15 16:25:37 -04:00
FalseIncarnate
a68ddb1116
Global Intercom list, minor code cleanup round 2
2016-05-06 03:20:00 -04:00
Fox-McCloud
5145825470
Part 4
2016-04-17 22:48:05 -04:00
Tastyfish
25195208a9
Ports tg simple_animal bots
2016-03-28 00:22:04 -04:00
Aurorablade
5f98feb0bc
meanwhile as i driver tiger INSANE
2016-02-25 16:17:39 -05:00
Aurorablade
f352c290de
end conflict fix
2016-01-21 21:34:16 -05:00
Aurorablade
363da58264
being conflict fix
2016-01-21 20:50:24 -05:00
Aurorablade
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -05:00
Tigercat2000
e60799474b
tgshuttles unfinished
2015-12-03 10:59:06 -08:00
Fox-McCloud
9795dc761b
Removes Nations and Unused Game Modes
2015-10-11 19:51:19 -04:00
Fox-McCloud
d7f23f4271
Oh, that kind of list
2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131
lists
2015-09-27 19:24:35 -04:00
Markolie
b770e8f2a0
Implant fixes/updates
2015-09-23 02:51:33 +02:00
Markolie
2787c2fd46
sortAtom improvements
2015-08-28 23:52:27 +02:00
Markolie
80360fd8a9
Malf AI update
2015-08-18 20:22:38 +02:00
Markolie
51035f931e
Powernet rework
2015-07-31 23:59:41 +02:00
Fox-McCloud
b9a492a3a5
no world
2015-07-06 23:25:29 -04:00
Tigercat2000
993ad208a8
Overhaul global defines and vars
...
This commit overhauls the global.dm file, global_lists.dm file, and
defines.dm file into a tree system based on -tg-.
All defines have been split and distributed in code/__DEFINES/
Everything from global.dm and global_lists.dm has been split and
distributed in code/_globalvars
The _compile_options.dm file contains anything that absolutely, 100%, must
be initialized before world.dm.
Name definitions have been moved to code/_globalvars/lists/names.dm.
Other things to note
- All instances of something.z == 2/1/3/5 have been replaced with easily
configurable defines, labeled ZLEVEL_. The map include file can
override these by defining custom ones in it's file, as it is at the
top of the tree.
2015-05-12 20:48:38 -07:00
