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
jack-fractal
1c772ec1ff
- fixing some compile errors and duplication
2014-05-13 20:48:33 -04:00
jack-fractal
1bd866239f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/cult/runes.dm
code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04:00
Chinsky
bb33eddb63
Merge pull request #4978 from Ccomp5950/special-role-color-fix
...
Removes the special name coloring of those with special roles from inappropriate times.
2014-05-14 03:51:40 +04:00
Chinsky
a3340e797e
Merge pull request #4980 from Loganbacca/clickfix
...
Invulnerable windows fix
2014-05-14 03:51:21 +04:00
Loganbacca
25983be804
Added exception for breaking full tile windows on top of single pane windows
2014-05-13 23:29:11 +12:00
Ccomp5950
a75defd96d
Merge pull request #4975 from Zuhayr/nymphs
...
Added a *chirp sound clip for diona nymphs.
2014-05-12 22:14:20 -05:00
Ccomp5950
76f8a94974
Removes the special name coloring of those with special roles from inappropriate times.
...
Basically if we don't want a privmsg link we're not going to include the font change as well. This should fix it from displaying the coloring code in logs and other places not meant to be html (irc bot).
2014-05-12 21:27:02 -05:00
Zuhayr
681c7bbe53
Attempting to fix a bug involving resource stacks failing to appear when used.
2014-05-13 11:47:20 +09:30
Ccomp5950
5a1ab29c2a
Merge pull request #4974 from Zuhayr/dev
...
More more drone fixes.
2014-05-12 20:26:05 -05:00
bs12-bot
1f614c3149
Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light
...
Fixes runtime with yellow slime extracts.
2014-05-12 19:02:31 +01:00
Zuhayr
2998ab3bd1
Adds inter-drone speak at close range (say)
2014-05-13 02:24:56 +09:30
Chinsky
7773de913d
Merge pull request #4970 from Zuhayr/dev
...
More drone fixes.
2014-05-12 20:43:41 +04:00
Ccomp5950
cc615ee06d
Merge pull request #4963 from mwerezak/accessory-fix
...
Accessories
2014-05-12 11:43:05 -05:00
Zuhayr
7bab9aea47
Fixes no cooldown on shutdown drones, adds wood tiles and rglass to drone module, changes how regenerating resources work slightly.
2014-05-13 02:12:05 +09:30
Ccomp5950
bc21d1734c
Merge pull request #4962 from mwerezak/internal-storage-ground-fix
...
Internal storage fix
2014-05-12 11:41:48 -05:00
Ccomp5950
08687ecfde
Merge pull request #4966 from Loganbacca/bayfix
...
Compressed matter implanter fix
2014-05-12 11:40:31 -05:00
Ravensdale
8e15a76da1
Fixes runtime with yellow slime extracts.
2014-05-12 01:15:45 -07:00
Zuhayr
1dd7f0db96
Added a *chirp sound for diona nymphs.
2014-05-12 16:26:21 +09:30
Zuhayr
a819477e55
Allowed drones to decompile dead but not gibbed clientless drones.
2014-05-12 16:12:59 +09:30
Zuhayr
d3f1731c00
Simplified robot repairs a lot for drones. No more organ damage for them.
2014-05-12 16:01:39 +09:30
Zuhayr
7574e99acd
Added a cooldown to CLONG CLONG from moving in disposals.
2014-05-12 15:00:52 +09:30
Zuhayr
590f980ea9
Allowed magnetic grippers to remove APC cells.
2014-05-12 14:51:55 +09:30
Zuhayr
df7a589bd4
Made drone control consoles buildable/researchable.
2014-05-12 14:51:42 +09:30
