PsiOmegaDelta
|
34fdc4712e
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
|
2015-07-14 08:21:12 +02:00 |
|
Zuhayr
|
5e1ae26b74
|
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
|
2015-07-14 05:19:01 +09:30 |
|
PsiOmegaDelta
|
2ed978b1e1
|
Wizards can no longer de-jaunt in turfs with dense objects.
Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.
|
2015-07-12 14:31:26 +02:00 |
|
PsiOmega
|
0a05c2659f
|
All the span-corrected dm files.
|
2015-06-14 22:08:14 +02:00 |
|
PsiOmega
|
ee88e7b8b4
|
Base Life-addition()
|
2015-06-13 13:36:08 +02:00 |
|
PsiOmega
|
e7d85f8edc
|
Adds Destroys.
|
2015-04-24 17:11:14 +02:00 |
|
PsiOmega
|
1ae0ad6d92
|
Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
|
2015-04-24 09:59:05 +02:00 |
|
PsiOmega
|
d381eb6083
|
Drops the machinery part of the singularity.
|
2015-04-16 12:51:02 +02:00 |
|
PsiOmega
|
990530d118
|
Ports /vg/'s spell system for the sake of cult porting.
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
|
2015-04-09 20:08:06 +02:00 |
|