Commit Graph

8664 Commits

Author SHA1 Message Date
ririchiyo
b2c32c27aa how2html 2015-01-15 19:37:26 -05:00
ririchiyo
005e77b638 testing fix for ghosts to follow, spooky. 2015-01-15 18:46:10 -05:00
ririchiyo
8cd7f0b7a3 changes some things around with the emag and makes emagged modules properly show up and become selectable. 2015-01-15 18:14:02 -05:00
ririchiyo
375ce12741 AI's couldn't speak, should probably fix it. 2015-01-15 15:07:06 -05:00
D3athrow
a4678a4215 Properly GC emitter beam effects. 2015-01-15 13:21:36 -06:00
D3athrow
2c4fee9caa Grab runtime fix 2015-01-15 13:21:24 -06:00
D3athrow
77967cc605 qdel grabs 2015-01-15 12:09:54 -06:00
d3athrow
5a0d4b0185 Merge pull request #2501 from d3athrow/say_code_rework
Say Code Rework [Ready for Testing]
2015-01-15 11:15:52 -06:00
ririchiyo
2055bea868 Merge pull request #2517 from d3athrow/hud_rework_BE
port of the cyborg HUD from /tg/ with small fixes to the mat synth.
2015-01-15 00:42:39 -05:00
d3athrow
f870fb508a Merge pull request #2520 from eswordthecat/patch-200
tg powernets
2015-01-14 16:39:49 -06:00
D3athrow
474d6bd1c4 Fix #2519 2015-01-14 15:58:52 -06:00
eswordthecat
cb4f93895d Final changes. 2015-01-15 05:35:12 +08:00
eswordthecat
6a40cc4215 Merge remote-tracking branch 'upstream/Bleeding-Edge' into patch-200 2015-01-15 04:44:26 +08:00
D3athrow
06bb07835b This one was ririchiyo's fault somehow 2015-01-14 12:06:14 -06:00
D3athrow
ae7230fbb8 FILTHY FILTHY PULL REQUEST 2015-01-14 12:02:31 -06:00
D3athrow
c5fccf2b0b Kill me now 2015-01-14 12:02:08 -06:00
D3athrow
1c2fad1f13 Look at me usin colons! 2015-01-14 12:00:30 -06:00
D3athrow
68f7cfba43 I'ma usin da runtime operator and you can't stop me~ 2015-01-14 11:59:55 -06:00
Chris
f9b20eb10d wee i'm ruining the clean PR 2015-01-14 11:55:06 -06:00
Chris
3844f6c7c6 Dicks Oak 2015-01-14 11:53:48 -06:00
Chris
76d831b631 Merge branch 'Bleeding-Edge' into say_code_rework
Conflicts:
	code/modules/mob/dead/observer/observer.dm
2015-01-14 11:49:16 -06:00
Chris
fbbf14ed1d Merge branch 'Bleeding-Edge' into say_code_rework
Conflicts:
	code/modules/mob/living/living.dm
2015-01-14 11:46:58 -06:00
Chris
21b16ad911 Conflict fix 2015-01-14 11:43:48 -06:00
Chris
1c06c14c34 Just fart and hug things. 2015-01-14 11:39:32 -06:00
ririchiyo
ec94ec8fb1 honk. 2015-01-13 18:33:50 -05:00
ririchiyo
040576ac15 almost finished with cyborg HUD from /tg/ 2015-01-13 18:25:37 -05:00
d3athrow
1d68a30d2d Merge pull request #2374 from ComicIronic/Mountables
Code rework of placing things on walls.
2015-01-13 13:39:20 -06:00
Chris
c0a282a8b8 pull and point as mob verbs 2015-01-13 13:38:58 -06:00
Chris
0c673f1cd7 i'm done 2015-01-13 13:35:53 -06:00
Chris
81ee98d067 who knew 2015-01-13 13:34:36 -06:00
Chris
4c187dff47 sanity 2015-01-13 13:31:57 -06:00
ComicIronic
8d13169e14 More merge. 2015-01-13 19:30:09 +00:00
ComicIronic
0a299030ef Fix merge conflicts. 2015-01-13 19:26:10 +00:00
Chris
312648cca8 Tune robot movespeed
mommis have normal speed again
sec and combat borgs are slower.
2015-01-13 12:58:10 -06:00
Chris
1a3aaa62db Sanity 2015-01-12 21:18:01 -06:00
d3athrow
e15c2bc5f2 Merge pull request #2497 from eswordthecat/patch-100
Re-add grid check to possible events.
2015-01-12 19:57:34 -06:00
d3athrow
d3d78be84f Merge pull request #2509 from ComicIronic/Macros
Replaces typecheck procs with macros.
2015-01-12 19:57:21 -06:00
Chris
555c208389 Slayed the laggy library beast thanks to volundr from goon and tkdrg from tg. 2015-01-12 17:58:26 -06:00
ComicIronic
0b1183b0ca Replaces typecheck procs with macros.
Now defined in _macros.dm, the highest file in _HELPERS (one of these macros is used in code/_HELPERS/game.dm).
Coderbus gave it the okay.
2015-01-12 20:55:33 +00:00
ririchiyo
d40665ddc5 small fix to emotes and changing Object Say's name to OSay. 2015-01-12 15:16:31 -05:00
ririchiyo
6e10d5d10b wow, how do variable names work work 2015-01-12 09:55:57 -05:00
ririchiyo
817520ecdb tgstation#4636 2015-01-12 08:45:53 -05:00
ririchiyo
2c69c0dc15 There's no way this done yet. 2015-01-12 08:45:52 -05:00
eswordthecat
764d01dc3e e65919da42 2015-01-12 15:42:50 +08:00
d3athrow
6d0ebd0a5e Merge pull request #2502 from clusterfack/turf
Small Changes
2015-01-12 01:25:26 -06:00
clusterfack
ca521a04cb Made MMIs examine text show if they are locked or unlocked. Move the size examine text to the same line as the name. Made mmis/posibrains drop parts used for creating mommis that you have added to them when added to a robot. Made turfs not lose or gain gases when you change their turf. 2015-01-12 01:19:04 -06:00
eswordthecat
7dc2d76ef2 c6c8c58ef7 2015-01-12 15:08:53 +08:00
eswordthecat
fd6f282460 788a97471f 2015-01-12 15:02:49 +08:00
eswordthecat
d91e8bc090 6749f21042 2015-01-12 15:01:10 +08:00
eswordthecat
3cbd393ed8 2269a2f168 2015-01-12 14:27:32 +08:00