Commit Graph

12467 Commits

Author SHA1 Message Date
Jordie d5f927520d Merge pull request #9422 from AnturK/borg_fix
Fixes increased borg battery drain
2015-05-09 22:17:25 +10:00
AnturK 5f848a94eb Fixes increased borg battery drain 2015-05-09 14:07:42 +02:00
Jordie 67fe7dc25c Merge pull request #9396 from Firecage/Nodropmutants
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-09 22:05:04 +10:00
Jordie a73ef787a2 Merge pull request #9380 from SconesC/spooky-faces
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-09 22:03:34 +10:00
Jordie aafa80dcd8 Merge pull request #9378 from GunHog/diamond_tipped_spirals
Fixes the mining borg diamond drill upgrade
2015-05-09 21:45:21 +10:00
Jordie 4e82cd9689 Merge pull request #9355 from Firecage/OverlaycleanBGone
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
Jordie 279a2653c6 Merge pull request #9347 from SamuelRowe/master
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
Jordie da28ed2138 Merge pull request #9290 from AnturK/giant_enemy_crab
Adds resize variable for mobs
2015-05-09 20:29:55 +10:00
Remie Richards fdeb84021d Merge pull request #9320 from GunHog/Botcall_V2
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
Remie Richards c77fefc937 Merge pull request #9374 from AnturK/abduction_third
Abduction fixes
2015-05-09 06:25:23 +01:00
Remie Richards 14aa907252 Merge pull request #9407 from phil235/StaminaFix
Fixes stamina damage
2015-05-09 06:03:26 +01:00
Remie Richards 3b98e4448d Ports /vg/ DeityLink's new explosion effect, Blast doors are more resistant to explosions, Explosions can now take walls and doors into account (Cheaper than recursive explosions), Engine floors are more resistant to explosions. 2015-05-09 01:02:06 +01:00
GunHog 155ddec1f4 Removes Mining Drill from voucher choices
- Removed mining drill from voucher choices
- Minor oversight fixed in rechargers.
2015-05-08 11:53:48 -05:00
phil235 24bc259d24 Fixes a runtime with headcrabs controled by non changeling players. 2015-05-08 17:56:59 +02:00
AnturK 90724e6306 Adds resize variable for mobs 2015-05-08 17:28:19 +02:00
GunHog 26df5b6c8e Removes mining drill power mechanic.
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
phil235 489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
Fixes #9035, atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
phil235 b5bbc6f1ef Fixes aliens getting an exhaustion message.
Fixes nearly infinite loop when calling setStaminaLoss -> CHeckStamina -> SetStaminaLoss -> etc...
CheckStamina is now called in carbon/handle_status_effects instead of carbon/handle_regular_status_updates().
2015-05-08 15:37:40 +02:00
Jordie 2febf4dacd Merge pull request #9293 from xxalpha/cable_color
Engineering Cyborgs can now change their cable coil color.
2015-05-08 22:10:58 +10:00
Jordie f16c21e99f Merge pull request #9252 from RemieRichards/MapGeneratorImprovements
Procedural Map Generator Improvements [Perfect for Merging/Porting]
2015-05-08 22:10:17 +10:00
Jordie0608 e72a4fb580 Drop-Everything deletes NODROP items 2015-05-08 18:40:23 +10:00
Jordie0608 0632b04eb4 fixes white crayons making nitrile gloves 2015-05-08 18:20:43 +10:00
Firecage 1fb8dcecd1 Prevents golems and skeletons from dropping due to shards and mousetraps 2015-05-07 15:44:17 +02:00
Cheridan 9e863a46d8 Merge pull request #9373 from AnturK/bunny_sterilization
Fixes leftover easter rabbit event
2015-05-07 07:54:35 -05:00
Xhuis 722d6d75cb Changes the admin quotes 2015-05-06 20:27:10 -04:00
Samuel Rowe c8ea983267 More 2015-05-07 11:20:14 +12:00
Samuel Rowe 98fedd31c7 Fix 2015-05-07 11:13:40 +12:00
GunHog 45f2336413 Fixes the mining borg diamond drill upgrade
- Made the borg diamond drill upgrade a child of the standard borg
mining drill.
2015-05-06 10:09:57 -05:00
Jordie0608 f85b3735bd group of fixes 2015-05-07 00:40:26 +10:00
Cheridan e91300f07d Merge pull request #9168 from Ikarrus/SMES_boost
[MAP] Doubles Initial Engineering SMES charge
2015-05-06 09:28:04 -05:00
Cheridan 95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
Cheridan f49fbf1efc Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
Cheridan 09c3c2cdc1 Merge pull request #9321 from KorPhaeron/master
Slime Mutation Changes +new reactions
2015-05-05 22:12:51 -05:00
KorPhaeron daa9a92998 Update slime.dm
Fixed mutator used to be boolean
2015-05-05 21:50:22 -05:00
KorPhaeron 91be614fa5 More changes
Based on Remie's suggestions
2015-05-05 21:49:49 -05:00
Cheridan a48374e3a5 Merge pull request #9333 from Dorsisdwarf/fixesbug-goofball
Fixes #9222 Dead monkies still scream when patches applied
2015-05-05 21:43:42 -05:00
Cheridan 867f283d85 Merge pull request #9330 from Jordie0608/whenpushcomestoshoveruntimeswilloccur
Fixes #693, non-humans pushing restrained mobs
2015-05-05 21:11:58 -05:00
SconesC 20181c37b8 Replaces Plasmaman Gas Mask w/ Breath Mask 2015-05-05 17:55:32 -07:00
xxalpha cc11481182 Copied Aranclanos better fix. Added a portable camera to the AI. 2015-05-06 00:18:57 +01:00
xxalpha cdfbc24b50 Fixed AI seeing more than it should when its Eye was moved to the Core. 2015-05-05 23:14:14 +01:00
GunHog 2c7ca4236c New Posibrain enter method
- Positronic Brains are now activated in the same manner as drones -
click the item to enter it.
2015-05-05 16:41:55 -05:00
Firecage e2b2ce91e6 Message_Admin() and Game_Log() added 2015-05-05 20:34:25 +02:00
Firecage c0c2c8b097 cleanable #define 2015-05-05 18:51:44 +02:00
AnturK ac4b76ac52 Fixes #9257 2015-05-05 18:50:30 +02:00
Firecage 522e77752f Removes the ability to clean Overlays 2015-05-05 17:36:51 +02:00
Jordie0608 e810855367 reorganizing stray objs in /defines 2015-05-05 21:18:21 +10:00
Dorsisdwarf 4a0df6fd45 Fixes #9222 2015-05-04 17:31:51 +01:00
Jordie0608 febd9406a0 mobs pushing restrained fix 2015-05-05 00:43:37 +10:00
Cheridan dfaf90c79e Merge pull request #9264 from phil235/BundleFix6
a group of fixes.
2015-05-04 09:41:01 -05:00
KorPhaeron 8b6b8887db More slime stuff
Further tweaks slime mutation chances based on Crimson's feedback, makes
the code prettier based on Remie's feedback
2015-05-04 09:05:42 -05:00