cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,314 Commits 5 Branches 0 Tags
2bc475ec41f4731e632e98e2ac7a1f9f1d933b47
Commit Graph

7431 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Zuhayr
c2616e3744 Fixes lack of update on drone fabricator console. 2014-05-12 13:18:52 +09:30
Zuhayr
b6a3c8a761 Fixes drone regeneration of materials issue. 2014-05-12 13:00:25 +09:30
Zuhayr
e0063c271b Fixes 'resource depleted' error for emagged drones. 2014-05-12 12:51:43 +09:30
Zuhayr
10ebe3b8b2 Fixes the decompiler. Adds spiderlings, broken globes, mice and lizards as valid targets. 2014-05-12 12:42:09 +09:30
Zuhayr
5295b9ee2e Readds drone held icon that got lost somewhere in merges. 2014-05-12 12:17:11 +09:30
Zuhayr
3afbae1479 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-11 22:53:37 +09:30
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Zuhayr
5b32b111d6 Double whoops. 2014-05-11 22:34:34 +09:30
Zuhayr
582a8e817a Fixes a runtime with drones building lights. 2014-05-11 22:31:27 +09:30
Zuhayr
45255e9e2e Whoops. 2014-05-11 22:07:24 +09:30
Zuhayr
a570f02835 Removed a redundant line. 2014-05-11 22:03:28 +09:30
Zuhayr
85279c97c4 Added toggle verb for drones. 2014-05-11 22:00:34 +09:30
Zuhayr
538bba9c42 Join As Drone and drone rebooting will now check cyborg jobbans. 2014-05-11 21:38:45 +09:30
Zuhayr
84ec5b6849 Merge branch 'weapons' of https://github.com/Zuhayr/Baystation12 into dev 2014-05-11 20:44:25 +09:30
Mike
6e391c01c9 Accessories are now visible when attached 
Uses overlays.

I was originally planning to use the SOUTH direction of the
icons/mob/ties.dmi image as the overlay, however this had problems with
the fact that those images are directional. Rather than override Move()
in clothing/under to reset dir to SOUTH whenever clothing with an
attached accessory was thrown or dragged, I thought it would be less
hacky to read the overlays from a separate .dmi.
 2014-05-10 22:30:09 -04:00
Mike
f3ea0ab223 Fixed accessories becoming improperly detached... 
when the host suit was clicked on. It is also now clearer who has the
responsibility for attaching and removing accessories.
 2014-05-10 20:37:15 -04:00
Mloc-Hibernia
1d2ce01039 mob: fix #4955 
Name parameter to track wasn't sanitized correctly.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-10 22:33:33 +00:00
Chinsky
963216b43b Merge pull request #4952 from Mloc/bs12-mineturfs 
mining: fix for mining cooling down
 2014-05-11 01:47:30 +04:00
Chinsky
799c279a86 Merge pull request #4950 from Mloc/bs12-pipefixes 
Map fixes
 2014-05-11 01:47:18 +04:00
Hubblenaut
952d7c9e93 Adds ability to photocopy paper bundles 2014-05-10 19:03:42 +02:00
Chinsky
3e52109077 Merge pull request #4949 from Zuhayr/master 
Fixes.
 2014-05-10 13:02:23 +04:00
Ccomp5950
699cbbfd96 Merge pull request #4941 from Zuhayr/dev 
Maintenance drones.
 2014-05-10 03:55:21 -05:00