Ccomp5950
ff0d667337
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
2014-05-24 19:02:16 -05:00
Ccomp5950
3b8ee547c6
Merge pull request #5046 from mwerezak/lightbulb-box
...
Fixes #5043
2014-05-23 17:51:05 -05:00
Ccomp5950
4f1d786a01
Merge pull request #5041 from mwerezak/folded-bags
...
Fixes bodybags not being able to be put back into their own box
2014-05-23 17:50:00 -05:00
mwerezak
c4e811829e
Fixes #5043
2014-05-22 18:47:38 -04:00
PsiOmega
a8e4dc045d
Fixes #4816 and nothing else. Cherry picked from #5036 .
...
Creates proper area instances for sections in engineering.
Removes one out of two APCs in the same area in medbay, adds two missing ones.
2014-05-22 23:12:50 +02:00
mwerezak
71ad2b3aae
Fixes bodybags not being able to be put back...
...
...into their own box. Also affects folded cryobags.
2014-05-22 16:44:26 -04:00
Ccomp5950
401f5ff1f8
Holopad now states what it hears, what a revolutionary concept.
2014-05-22 00:30:08 -05:00
Chinsky
26c85abf16
Merge pull request #5022 from Loganbacca/freezefix
...
Minor dev-freeze fixes
2014-05-18 18:35:53 +04:00
Loganbacca
7d75f6432d
Fixed doubled construct spells
...
Constructs were being assigned duplicated spell lists when spawned from soulstones
2014-05-18 19:52:03 +12:00
Zuhayr
56bdd108f9
Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.
2014-05-18 10:59:47 +09:30
Zuhayr
e3f0bcd118
Adds PASSEMOTES flag to setup.dm, dionaea and borers.
2014-05-18 10:50:13 +09:30
Chinsky
f577d21f8f
Merge pull request #5016 from Ccomp5950/no-undershirt
...
Humanoid mobs won't default to having an undershirt.
2014-05-18 05:18:20 +04:00
Ccomp5950
d41abb387f
Merge pull request #5007 from mwerezak/closetfix-turf
...
do_after() checks both turf and loc
2014-05-17 20:02:15 -05:00
Zuhayr
a8db1cd2a3
Hopefully fixes the double push bug.
2014-05-18 10:22:29 +09:30
Ccomp5950
7c1d8b32d0
Humanoid mobs won't default to having an undershirt.
2014-05-17 16:01:49 -05:00
Chinsky
99c6598fd1
Merge pull request #5012 from Zuhayr/dev
...
Derp.
2014-05-17 08:55:50 +04:00
Zuhayr
5585da89c6
Derp.
2014-05-17 14:20:53 +09:30
Zuhayr
1679b4062f
Merge pull request #4985 from jack-fractal/dev
...
Masks of Nar'sie - Testing Version
2014-05-17 14:01:00 +09:30
Chinsky
5b761f5207
Merge pull request #5011 from DJSnapshot/hotfix
...
Forgot I would need a null check.
2014-05-17 08:29:16 +04:00
DJSnapshot
56e3d0a37f
Forgot I would need a null check.
2014-05-16 21:26:08 -07:00
Zuhayr
7739e9954d
Fixed an oversight in held icon rendering for humans.
2014-05-17 13:50:08 +09:30
Zuhayr
8f97e9965b
Added leap and gut verbs to vox.
2014-05-17 13:49:45 +09:30
Zuhayr
911218067c
Added computer boards and gas tanks to the drone gripper (oversight).
2014-05-17 13:45:02 +09:30
Zuhayr
06883912e4
Commented out some debug lines.
2014-05-17 13:37:32 +09:30
Chinsky
91751cb56d
Merge pull request #5005 from Zuhayr/mobcache
...
Caching system for human icons, generalized breathing.
2014-05-17 07:57:54 +04:00
Chinsky
d51e048365
Merge pull request #5003 from Hubblenaut/dev
...
Paper bundle design and functionality update
2014-05-17 07:12:51 +04:00
Zuhayr
04315c1d43
Merge pull request #5001 from Intercross21/dev
...
More nice looking give spell/disease interface
2014-05-17 10:42:31 +09:30
Zuhayr
3aa1609ce6
Merge pull request #4998 from mwerezak/camera-alarm-cleanup
...
AI and cyborg alarm code cleanup
2014-05-17 10:38:16 +09:30
jack-fractal
bd3eeca855
fixing the player panel to work with spirits and masks
2014-05-16 19:19:22 -04:00
Ccomp5950
cb093122d2
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2014-05-16 18:11:11 -05:00
jack-fractal
feecd8dc2b
removing debugging junk from the spirit topics follow commands
2014-05-16 17:13:43 -04:00
Mike
df78402da8
Simplifies radio and language code checking
...
Also moved the procs used to parse the codes into mob/say.dm to make it
easier for mobs that aren't carbon/humans to use language codes in the
future.
2014-05-16 13:33:19 -04:00
Mike
824f9ceea8
do_after() checks both turf and loc
2014-05-16 13:13:02 -04:00
Zuhayr
76c00a9f6e
Removed vox snowflake crap from human breathing, expanded it out so that species datums will inform breathable gas, toxic gas and exhaled gas types.
2014-05-16 12:15:20 +09:30
Hubblenaut
66052c6eba
Merge branch 'paperbundle' into dev
2014-05-16 03:50:10 +02:00
Chinsky
8d1928c117
Merge pull request #4992 from Loganbacca/closetfix
...
Closet wrapping fixes
2014-05-16 05:42:31 +04:00
Chinsky
ccbbde2482
Merge pull request #4997 from mwerezak/camera-alarm-fix
...
Fixes #4977
2014-05-16 05:38:05 +04:00
Hubblenaut
ee22d0558b
Anyone who cannot read a paper is not able to read a bundle either
2014-05-16 00:05:21 +02:00
Hubblenaut
42ab7e2b00
Makes photos visible on bundles
2014-05-15 22:21:11 +02:00
Intercross21
e6efa81c77
More nice looking give spell/disease interface
2014-05-15 22:03:16 +04:00
Loganbacca
78e0224649
Fixed resisting out of lockers
2014-05-15 23:03:21 +12:00
Zuhayr
081032372b
Added a caching system for human icons.
2014-05-15 20:14:32 +09:30
Zuhayr
bab69d73ef
Fixes another drone runtime, fff.
2014-05-15 19:12:12 +09:30
Zuhayr
7226486124
Fixing a bug with leap() and gut()
2014-05-15 15:09:48 +09:30
Zuhayr
8e76966357
Added species.sprite_sheets[] checks to human icon_update proc.
2014-05-15 14:55:13 +09:30
Zuhayr
a528a4db1f
Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi.
2014-05-15 14:46:27 +09:30
Zuhayr
429684d5ac
Squashed armalis/vox commits and human icon update commits:
...
Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
2014-05-15 14:30:37 +09:30
Zuhayr
ef5aaf0610
Merge pull request #4991 from Loganbacca/altfix
...
Alt click fix
2014-05-15 14:07:47 +09:30
Zuhayr
cee5f92bcf
Merge pull request #4986 from Intercross21/dev
...
Now you can set ZAS/Plasma settings to initial
2014-05-15 14:07:24 +09:30
Mike
1c9a384a8d
Cherrypick from 'ai-alarms'
...
Refactoring and clean-up of alarm code for AI and robots.
2014-05-14 20:20:30 -04:00
