GinjaNinja32
|
0c1aee8074
|
Fixes <span class='class>, makes Travis check it
|
2015-07-18 21:13:32 +01:00 |
|
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 |
|
Zuhayr
|
52cc850bf8
|
Merge pull request #10115 from PsiOmegaDelta/150712-SolidJaunting
Wizards can no longer de-jaunt in turfs with dense objects.
|
2015-07-13 06:14:44 +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 |
|
Mloc
|
278a4c38ec
|
get rid of mob.see_in_dark and species.darksight
They don't work with the current lighting system and cause weird artifacts.
Signed-off-by: Mloc <colmohici@gmail.com>
|
2015-07-09 19:17:04 +01:00 |
|
Zuhayr
|
48cf00ca54
|
Merge with dev-freeze.
|
2015-06-21 20:45:47 +09:30 |
|
mwerezak
|
f8d5127078
|
Adds SLOT_EARS to various items
|
2015-06-21 01:45:43 -04: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 |
|
Yoshax
|
7b19c85ac5
|
Makes file use user and not usr
|
2015-06-05 19:04:11 +01:00 |
|
Yoshax
|
afe081d836
|
Makes scrying orb only usable by wizards
|
2015-06-05 18:35:19 +01:00 |
|
Yoshax
|
c960fad48e
|
Changes teleportation scroll and spellbook to be only usable by wizards
|
2015-06-04 20:21:31 +01:00 |
|
Mloc
|
16d50c645d
|
new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
|
2015-05-10 20:54:25 +01:00 |
|
Kelenius
|
b7a628d53d
|
Merge branch 'dev' into ofBotsAndMobs
Conflicts:
code/game/machinery/bots/cleanbot.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/floorbot.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/bots/secbot.dm
code/game/objects/items/robot/robot_parts.dm
|
2015-04-26 17:18:20 +03: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 |
|
PsiOmega
|
71a8ddf50e
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
|
2015-04-08 10:55:26 +02:00 |
|
mwerezak
|
9ad533a094
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/mob/living/carbon/monkey/update_icons.dm
code/modules/mob/mob_helpers.dm
code/modules/spells/spellbook.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
|
2015-03-31 00:16:56 -04:00 |
|
PsiOmega
|
710abd0921
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/spells/mind_transfer.dm
|
2015-03-29 16:23:06 +02:00 |
|
Zuhayr
|
ba648e3e8d
|
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
|
2015-03-26 12:45:12 +10:30 |
|
Zuhayr
|
d26800d29c
|
Preliminary work on converting all monkeys to a human subspecies.
|
2015-03-25 02:15:45 +10:30 |
|
Zuhayr
|
98da191ac3
|
Gamemode refactor, lots of code shuffles, PR will have details.
|
2015-03-21 11:08:17 +10:30 |
|