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
a8db1cd2a3
Hopefully fixes the double push bug.
2014-05-18 10:22:29 +09:30
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
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
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
Mike
c9dd123c2b
Fixes #4977
2014-05-14 19:59:52 -04:00
Mloc-Argent
e24dd57a65
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 22:42:03 +01:00
Intercross21
a704efa3a9
Now variables renamed too.
2014-05-14 16:25:37 +04:00
Chinsky
5af92b2906
Merge pull request #4989 from mwerezak/disease2-runtime
...
Fixes #4965
2014-05-14 15:01:21 +04:00
Chinsky
98ee34a555
Merge pull request #4990 from Zuhayr/master
...
Fixes #4810
2014-05-14 15:00:23 +04:00
Chinsky
1c6a8c3a34
Merge pull request #4988 from mwerezak/generator-replacement
...
Replaces broken generator in eng hard storage
2014-05-14 14:59:24 +04:00
Loganbacca
03a01fc805
Closet wrapping fix
...
- Removed ability to wrap closets if you are inside them
2014-05-14 21:55:51 +12:00
Loganbacca
86190c0edb
Fix resisting out of closets
...
- Removed do_after proc since it was hanging somewhere
2014-05-14 21:54:49 +12:00
Loganbacca
9731082e3e
Added a quick adjacent check for alt-clicking
...
Since we really don't need to be doing a pathing check when we just want to return an object list.
2014-05-14 19:59:40 +12:00
Zuhayr
e26d7fdb6f
Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev
2014-05-14 17:12:26 +09:30
Zuhayr
be992ab9a7
Fixes drone fabricator runtime.
2014-05-14 17:12:03 +09:30
Zuhayr
ce4f7d4708
Fixes #4979
2014-05-14 17:02:04 +09:30
Mike
4ceada67fd
Fixes #4965
2014-05-14 01:15:01 -04:00
Mike
2d2a145907
Replaces broken generator in eng hard storage
2014-05-14 00:47:01 -04:00
Intercross21
9fd94c171e
...
2014-05-14 07:32:01 +04:00
Intercross21
8adef38cc4
Now you can set ZAS/Plasma settings to initial
2014-05-14 07:28:53 +04:00
