83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
adaccb3c3e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-11 10:45:57 +10:30
bc6561b9e4
Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes.
...
Who does that? People that cause runtimes, that's who!
(Jerks)
2014-01-10 15:59:40 -06:00
6f01e97161
Merge pull request #4248 from Zuhayr/dev
...
Dionaea changes (microwave recipe, holder procs) and resist verb.
2014-01-10 13:47:46 -08:00
efa5a600e3
Merge pull request #4252 from RKF45/ears
...
Tiny objects on ears
2014-01-10 13:47:10 -08:00
e524d2112f
Merge pull request #4244 from LightningIron/master
...
Ninja bugfixes/minor code cleaning/energy cost changes
2014-01-10 13:42:42 -08:00
4c1e17649e
Merge remote-tracking branch 'upstream/master' into dev
2014-01-10 20:07:47 +00:00
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
38f47f5ae1
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-10 21:27:15 +10:30
65e6a79946
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-10 21:26:47 +10:30
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
c47be94b42
Removes braindeath as IC term
2014-01-09 21:49:21 +01:00
906768070f
Resolved custom_items.dmi.
2014-01-10 04:15:21 +10:30
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
8c26c23157
Merge remote-tracking branch 'upstream/master'
2014-01-09 11:15:26 -06:00
d3d6294ab0
Compile fix, ugh.
2014-01-10 03:07:17 +10:30
331dd3e286
Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.
2014-01-10 01:58:22 +10:30
35d8219bb6
Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
2014-01-09 23:57:20 +10:30
943554242a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-09 23:53:34 +10:30
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
09c56a0930
BS12 compile fixes for Constructs
2014-01-09 04:49:16 -05:00
b4f401e3b6
Constructs missing all their abilities -- Taken from /tg/
...
Desc of constructs and cult mode promises certain abilities to various
constructs that were missing. Also fixes some typos.
2014-01-09 04:40:37 -05:00
f79ffa598e
Tradeband and Gutterspeak now have a different font than Tradeband.
...
Fixes #4143
2014-01-08 22:15:47 -07:00
8ae2266526
Added captured variable to mobs, non-chair equivalent to being buckled into a chair
2014-01-08 20:49:45 -06:00
3259ccf86f
Merge pull request #4217 from DJSnapshot/dev
...
Custom stuffs!
2014-01-08 17:22:29 -08:00
dfdeed7434
Made the follow verb less buggy.
...
Removed duplicated code.
2014-01-08 19:14:15 +00:00
794be2b31e
Fix previous commit for BS12.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-08 11:49:15 +00:00
68ae21fac3
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
Conflicts:
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/modules/admin/verbs/debug.dm
code/modules/clothing/masks/gasmask.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/TextFilters.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/ai/say.dm
2014-01-08 11:41:51 +00:00
a040cb8f08
Commit testing? What's that? Single character fix for pulse checking.
2014-01-08 21:07:10 +10:30
787da649c1
Safer way to do the alien thang.
2014-01-08 11:05:58 +10:30
c8b595be95
Added an alien var to metabolize procs for humans and monkeys to tie into alien reagent reactions.
2014-01-08 10:27:21 +10:30
1faf2ef25b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:47 +10:30
a039f05372
Merge pull request #4224 from Ccomp5950/bug_fixes
...
Bug fixes
2014-01-07 02:36:51 -08:00
39c04e06f0
Fix so that custom sprited borgs don't spawn as a cardborg
2014-01-06 12:50:30 -08:00
3b072b32b0
More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.
2014-01-06 14:54:35 +10:30
b28592d707
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-06 13:42:23 +10:30
cd4ef7a1b7
Ghost chat unicode support...removed unneeded sanitize()
2014-01-05 19:30:52 -06:00
d0ac6e6fff
Forgot a var.
2014-01-06 00:15:55 +10:30
22e325d6ec
Implemented IS_SLOW.
2014-01-06 00:13:49 +10:30
b70a79f853
Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.
2014-01-05 23:59:39 +10:30
2a2fffc616
Fixed a duplicate definition bug with WHITELISTED.
2014-01-05 23:36:16 +10:30
825f542011
Merge pull request #4206 from RKF45/fixes
...
Small fixes maybe?
2014-01-05 02:44:27 -08:00
6fed0c70da
Applying NO_BLOOD flag to bleeding code.
2014-01-05 14:06:51 +10:30
28d8109136
Added NO_BLOOD and IS_SLOW to dionaea.
2014-01-05 13:48:49 +10:30
9b2ff51486
Merge remote-tracking branch 'upstream/dev'
2014-01-04 19:41:19 +01:00
354b1978ea
Partial fix for pAI emotes (they still can't hear beyond one container
...
level, will require a say/emote code hack)
2014-01-04 15:22:17 +01:00
ed5307abd0
Added Air Analyser verb for ghosts to spy on supermatter and atmos
2014-01-04 12:27:07 +01:00
7005a66d5b
Fix for containers getting left behind when nymphs grow.
2014-01-04 13:28:32 +10:30
fa2b6fa6b4
Couple of oversights with diona.
2014-01-04 13:23:59 +10:30
Ccomp5950