Commit Graph

13438 Commits

Author SHA1 Message Date
Matt 0b0ce96ddb Adds SpessChess! 2016-04-16 19:44:55 +02:00
Fox-McCloud f817351d2a part1 2016-04-16 10:40:21 -04:00
MarsM0nd d307eb9794 Fixes #4127
Reverts back to hemostat and alternatives for embeded object surgery.
2016-04-16 15:10:29 +02:00
Fox McCloud 3e7222610f Merge pull request #4216 from Tastyfish/420blazeit
Makes the game startup time significantly faster
2016-04-16 02:03:29 -04:00
Tastyfish 178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
TheDZD 42602d952f Merge pull request #4199 from Fox-McCloud/drinking-glass-sprites
Drinking Glass Sprites In-Hand
2016-04-15 22:06:31 -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
Fox McCloud 925bb2d9e2 Merge pull request #4203 from FlattestGuitar/shotglass
Adds shot glasses
2016-04-15 20:17:23 -04:00
Tastyfish 127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
Fox-McCloud afddc2d8f1 Fixes+Cleans Up Cold+Heat Resist Mutations 2016-04-15 00:38:44 -04:00
FalseIncarnate bdd379c5a2 Fixes Anomalies Not Neutralizing
Fixes #4167
2016-04-15 00:12:42 -04:00
Fox-McCloud 3f1e86e8e7 Syringe Injection QoL 2016-04-14 23:32:12 -04:00
Fox McCloud 83c3640b29 Merge pull request #4157 from Tastyfish/books-book-everywhere
Ports /vg/'s library computers
2016-04-14 23:01:33 -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 8109a5e1ee to_chat() should no longer 🐝 an issue 2016-04-14 20:30:31 -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 9cc5dbb812 Merge pull request #4176 from Fox-McCloud/hydroponics-items
Adds some Hydro Items to Autolathe and R&D
2016-04-14 19:13:47 -04:00
HugoLuman 8cf7e5af84 Adds the rest of the karma code
(Hopefully)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 16:12:46 -07: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 90a8ca108f Merge pull request #4036 from monster860/adminbus
Adds area editing, linking, and filling to buildmode
2016-04-14 19:07:49 -04:00
HugoLuman 12aa256a38 Adds karma/whitelist code
This makes them a 30 KP shop option, but could be altered to 45 KP without having to move their place on the list.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 15:22:47 -07:00
HugoLuman bfcebf8044 Adds Orluum to silicon dms, fixes random skin tone
Also, butt sprites

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 14:40:25 -07:00
TheDZD 33a24723c2 Merge pull request #4197 from Fox-McCloud/glasses-fix
Fixes Prescription Glasses
2016-04-14 15:44:13 -04:00
Mieszko Jędrzejczak 63470e0c71 I'm bad at inventive descriptions 2016-04-14 21:27:59 +02:00
Mieszko Jędrzejczak 7888adf6c5 Better desc ;) 2016-04-14 21:12:38 +02:00
Mieszko Jędrzejczak 6b72a889e6 Shot glasses 2016-04-14 20:53:47 +02:00
Fox-McCloud 3e68373831 Drinking Glass Sprites In-Hand 2016-04-14 05:08:04 -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
HugoLuman 56ec95fe00 New color, Regen refactor
Regen tiers all shifted up by one
Previous tier 3 rates now tier 4, even harder to reach
Drask language now has its own color
(Bugged commits retconned)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 00:15:40 -07:00
HugoLuman 498e243f0f Drask burn_mod down from 4 to 2. Now it takes 5 laser shots to kill them, or 8 welder hits
Regen values altered to reflect that change in the maths:
Tier 3 regeneration: 10 brute and 10 burn per breath (once every four seconds)
Tier 2 regeneration: 6 brute and 6 burn per breath
Tier 1 regeneration: 3 brute and 3 burn per breath
Tier 3 regeneration now requires an upgraded freezer to get internals cold enough
hot_env_multiplier = 2 added

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-13 20:07:00 -07:00
Fox-McCloud 9005622ea7 Genetics Fixes and Tweaks 2016-04-13 21:21:52 -04:00
HugoLuman 4d0792e020 Gives Drask skin tone and makes it choosable in the character menu
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-13 15:23:55 -07:00
TheDZD 7e30d13c06 Merge pull request #4174 from Fox-McCloud/blind-fix
Fixes Blind Player Preference Doing Nothing
2016-04-13 16:23:04 -04:00
Fox-McCloud 81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -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
HugoLuman f6c48c187e Removes commented-out and unused code from organ files, removes pointless can_revive_by_healing from drask.dm
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-12 20:19:56 -07:00
HugoLuman afc46b0b9d No more color macros, clean compile
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-12 20:03:00 -07:00
HugoLuman b95cdecb89 Fixes merge conflict
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-12 19:26:34 -07:00
HugoLuman 71ad25c01c Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask
# Conflicts:
#	code/modules/mob/living/carbon/human/species/drask.dm
#	code/modules/surgery/organs/subtypes/drask.dm
2016-04-12 19:16:57 -07:00