Commit Graph

6375 Commits

Author SHA1 Message Date
Tastyfish
0820c03a18 Removes unnecessary extra stuff I did, makes bot radios cleaner 2016-04-16 18:36:21 -04:00
TheDZD
5b05d80ff7 Merge pull request #4098 from Fox-McCloud/pai-is-kill
Removes PAI Control of Security Bots
2016-04-15 22:04:39 -04:00
TheDZD
9fe7fe91f2 Merge pull request #4192 from Fox-McCloud/genetics-fixes-tweaks
Genetics Fixes and Tweaks
2016-04-14 22:25:35 -04:00
Fox McCloud
0a5972b9ba Merge pull request #4116 from TheDZD/NOTTHEBEES
It's the Bees!
2016-04-14 21:27:01 -04:00
TheDZD
8a64637c9e Merge pull request #4160 from Aurorablade/DammitScience
This is why we can't have nice things
2016-04-14 21:03:03 -04:00
TheDZD
821f8b244a Merge pull request #4198 from Fox-McCloud/dropper-paste
Remove Dropper Copy-Paste
2016-04-14 20:50:38 -04:00
TheDZD
341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
TheDZD
bb1caa4eea Instances loc setting should now all 🐝 changed to forceMove() 2016-04-14 20:30:34 -04:00
TheDZD
d88711cd8e Removes old bee file and fixes seed datum modification 2016-04-14 20:30:33 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Fox McCloud
f9a74914e2 Merge pull request #4173 from KasparoVy/head-accessory-fix
Head Accessories No Longer Hidden by BLOCKHEADHAIR
2016-04-14 20:22:00 -04:00
TheDZD
985ab85aae Merge pull request #4188 from Fox-McCloud/diona-refactor
Diona Species Behavior Handling Refactor
2016-04-14 19:17:17 -04:00
TheDZD
d95102b007 Merge pull request #4158 from Fox-McCloud/killer-tomato
Killer Tomatoes Live Up to their Name
2016-04-14 19:12:34 -04:00
TheDZD
f1672d6ccb Merge pull request #4156 from Fox-McCloud/mining-bot-update
Mining Bot Updates
2016-04-14 19:10:26 -04:00
Fox-McCloud
4e04570a12 Remove Dropper Copy-Paste 2016-04-14 04:27:16 -04:00
Fox-McCloud
d2827a4196 Fixes Prescription Glasses 2016-04-14 03:55:50 -04:00
Fox-McCloud
9005622ea7 Genetics Fixes and Tweaks 2016-04-13 21:21:52 -04:00
Fox-McCloud
cff3b9e7c6 more unsnowflaking 2016-04-13 00:47:44 -04:00
Fox-McCloud
5081e6d892 Diona Refactor 2016-04-12 23:54:12 -04:00
KasparoVy
41684a577c Fixes Issue With Head Accessories
Vulpkanin facial markings and Unathi horns will no longer magically
disappear when you wear something that hides hair. Now works in the same
manner as facial hair, being persistent

Fixes an issue where the facial markings of Vulpkanin and the horns of
Unathi Surgeons would disappear when they wore their surgical cap (i.e.
at spawn) and not regenerate without two triggers
2016-04-12 02:08:31 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
Aurorablade
e3bb76dd47 line removal 2016-04-11 00:54:53 -04:00
Aurorablade
211ba772af This is why we can't have nice things 2016-04-11 00:26:29 -04:00
Fox-McCloud
399813b36c Killer Tomatoes Live Up to their Name 2016-04-11 00:12:24 -04:00
Fox-McCloud
5e1fa7f8e2 Mining Bot Updates 2016-04-10 22:15:36 -04:00
Fox McCloud
922855385c Merge pull request #4143 from Tastyfish/syndi4life
Makes synipets and borgi not need to breathe air
2016-04-09 18:24:27 -04:00
Tastyfish
b6a7bbd622 Removes fun 2016-04-09 18:07:14 -04:00
Tastyfish
632595ce38 Tweaks 2016-04-09 16:00:59 -04:00
Tastyfish
2d521ac64e critical snpc hotfix 2016-04-09 15:20:27 -04:00
Tastyfish
20f8ca1095 Fixes meals prepared / food eaten scoreboard stats 2016-04-09 02:28:53 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Fox McCloud
ea9489db70 Merge pull request #4115 from tigercat2000/alt_appearances_remmie
Alternate Appearance system
2016-04-08 21:18:25 -04:00
Fox McCloud
9f4058a43e Merge pull request #4142 from Tastyfish/dsodfijas
Fixes cyborg pda messenger
2016-04-08 20:13:33 -04:00
Tastyfish
5aae9c30af Makes synipets and borgi not need to breathe, all cats eat mice (except syndicat) 2016-04-08 16:18:52 -04:00
Tastyfish
b00a8bf95a Fixes cyborg pdas 2016-04-08 15:00:52 -04:00
Fox McCloud
1e780bfcb5 Merge pull request #4131 from Aurorablade/DAMNMONKEYS
Playing with Monkey Meat
2016-04-07 22:31:39 -04:00
Aurorablade
7137af5fce forgot this 2016-04-07 22:20:50 -04:00
Aurorablade
7cf0f7627a Playing with Monkey Meat 2016-04-07 22:14:43 -04:00
TheDZD
8ad5e18757 Merge pull request #4112 from Fox-McCloud/xenobio-overhaul
Xenobio Refactor/Changes
2016-04-07 17:54:33 -04:00
TheDZD
be9087cca9 Merge pull request #4113 from Fox-McCloud/statues-fixing
TG Statue Fixes/Refactor
2016-04-07 17:54:17 -04:00
Tastyfish
29f9507052 Fixes pulling blood 2016-04-07 16:35:53 -04:00
Tigercat2000
801cbe7f8d Alternate Appearance system (from tgstation/-tg-station#16586)
This adds an "alternate appearance system" using image overrides and a new
handler system.

Usage:
 - Create a new `image()` casted as `var/image`
 - Set image.override = 1
 - Call mob.add_alt_appearance("appearance_ID", image, listOfMobsToDisplayTo).
 - To remove an image, you use mob.remove_alt_appearance("appearance_ID")

Comes with one usage, cardborg costumes. They will now disguise you as a
standard borg to any silicon mobs and yourself.
As this is a per-client system, that means that only silicon mobs and you will
see yourself as a standard borg. All other mobs will see you as a silly
human in a cardborg costume.
2016-04-06 13:58:03 -07:00
Fox-McCloud
64cd6a0cdc TG Statue Fixes/Refactor 2016-04-06 02:20:24 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Fox McCloud
a669d0fac4 Merge pull request #4107 from tigercat2000/to_chat
Replace most (if not all) output << operators with to_chat(user, message)
2016-04-06 00:39:02 -04:00
Fox McCloud
337ddd1896 Merge pull request #4111 from Tastyfish/straightjackets-derp
[s]Fixes restrained issue with slot clicking thing
2016-04-06 00:30:26 -04:00
Tastyfish
f86cb2b049 Fixes straightjacket issue with slot clicking thing 2016-04-05 23:24:24 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
Tigercat2000
c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -07:00
TheDZD
2546c290f4 Merge pull request #4095 from Fox-McCloud/mob-spawn-refactor
Simple Animal Spawn Refactor
2016-04-05 18:34:34 -04:00