Commit Graph

14667 Commits

Author SHA1 Message Date
Markolie
2cd437ee5f Fix window crushing 2015-01-19 18:35:45 +01:00
Markolie
2dfdd7243c Disable hardsuit breaches, re-add engi shuttle 2015-01-19 18:18:58 +01:00
Fox-McCloud
15a0443bcc Merge pull request #194 from Fox-McCloud/Malf-Hotfix
Hostile Lockdown
2015-01-18 22:41:52 -05:00
Fox-McCloud
7f724ed774 Hostile Lockdown 2015-01-18 22:40:53 -05:00
Fox-McCloud
3c3fdf6ad4 Merge pull request #193 from Fox-McCloud/Science-Station
Science Station
2015-01-18 22:07:42 -05:00
Fox-McCloud
098998ac89 Science Station 2015-01-18 21:43:40 -05:00
Fox-McCloud
2f6a31d173 Merge pull request #191 from TheDZD/minor-fixes
Minor Fixes
2015-01-18 16:09:29 -05:00
Fox-McCloud
af61ed860a Grey Rebalance 2015-01-18 15:54:11 -05:00
DZD
6dbd475166 Fixes Changeling Bug
Fixes the bug where changelings could extract DNA from races with
NO_SCAN if they used the extract DNA sting.
2015-01-18 15:32:14 -05:00
DZD
3278339bbe Fixes Crisis Cyborg Bug
They were getting advanced bruise/burn kits upon choosing the module,
but recharging gave them bruise kits and ointment instead.
2015-01-18 14:56:45 -05:00
Fox-McCloud
09900a7b0c Merge pull request #188 from Markolie/master
Fix away mission atmos, bug fixes
2015-01-18 01:32:45 -05:00
Markolie
bbdc450104 Atmos fix 2015-01-18 07:31:31 +01:00
Markolie
e0f434f0ed IPC hallucination fix 2015-01-18 05:02:36 +01:00
Fox-McCloud
b2285929cc Merge pull request #189 from TheDZD/armor
Armor and Damage Changes
2015-01-17 22:52:21 -05:00
Markolie
34a7bc645a Plasma iwndow coloring fix 2015-01-18 04:50:11 +01:00
DZD
f1eb7971e1 Armor/Damage Changes
- Fixes armor RNG killing for thrown items.
- Kidan no longer act like they have a built-in riot shield (50 -
damage/3)% chance to ignore damage, but take 20% less brute
consistently.
- Entirely missing with a projectile or melee attack is impossible, but
you are more likely to hit a part you were not aiming at. (Ports tg
ran_zone proc and axes current get_zone_with_miss_chance proc).
- Removes some snowflake code for lightning projectiles (Power Glove
traitor item uses these).
2015-01-17 22:33:47 -05:00
Markolie
ca74026ad3 ED-209 construction fix 2015-01-18 04:28:16 +01:00
Markolie
5b0b227343 Admin fax view fix 2015-01-18 03:59:20 +01:00
Markolie
9ff8d31f4f Updated blob event announcement 2015-01-18 03:17:25 +01:00
DZD
0820364e27 Returns check_zone to former state. 2015-01-17 20:51:29 -05:00
Fox-McCloud
9a1594fc78 Merge pull request #187 from Fox-McCloud/Pain-Health
Pain health
2015-01-17 20:30:06 -05:00
Fox-McCloud
2a96330cf3 Merge pull request #186 from Markolie/master
Major atmos overhaul: scrubbers and pipes can now co-exist
2015-01-17 20:28:53 -05:00
DZD
eb56e6c21c Ports check_zone and ran_zone from /tg/
As per Fox's request.
2015-01-17 20:25:48 -05:00
Markolie
f7ce7e55df Major atmos overhaul: scrubbers and pipes can now co-exist 2015-01-18 02:24:24 +01:00
DZD
648a5c8fb4 Kills Armor RNG
Ports over non-RNG armor from /tg/, currently is having issues with
thrown items (no damage if armored).
2015-01-17 20:22:12 -05:00
Fox-McCloud
840e1fc5c3 Pain Nerf 2015-01-17 20:15:12 -05:00
Fox-McCloud
c4913deff2 Merge pull request #185 from TheDZD/minor-fixes
pAI simple_mob Damage Fix
2015-01-17 16:43:11 -05:00
Fox-McCloud
ba4bfc7b31 Merge pull request #184 from TheDZD/magic
Wizard Bugfixes and One Spell Addition
2015-01-17 16:43:06 -05:00
DZD
a071f39eda pAI Damage Fix
- pAIs will now get torn to bits by simple_animal mobs. No more serving
as a perfect distraction on away missions.
Note: pAIs are still immune to toxin damage, as all silicons are, so
anything that does toxin damage will still be ineffective.
2015-01-17 13:43:58 -05:00
DZD
5713c3f04f Minor Fixes
- Makes mime invisible wall actually invisible.
- Fixes formatting mistake in wizard spellbook.
2015-01-17 12:26:05 -05:00
DZD
c769177a73 Wizard Bugfixes
- Prevents the Mutate spell from being used on z-level 2, so you can't
refund the spell while it's in use for permahulk.
- Ports in repulse spell from /tg/, it pushes away movable objects and
mobs away from the wizards. Mobs within 5 tiles will be stunned for 2
seconds, and mobs in the same tile as the wizard are stunned for 5 and
take minor damage.
- Fixes forcefields and forcewall spell by porting over
/obj/effects/forcefields.dm from /tg/. (This also fixes the mime wall,
god help us all)
- Mime forcefield nerfed to a 5 second duartion, retains 30 second
cooldown. (Yeah, let's not have those last 30 seconds.)
2015-01-17 12:12:28 -05:00
Fox-McCloud
52aff55f4e Merge pull request #182 from Markolie/master
Blob event fix, give ERT bowmans
2015-01-17 00:06:20 -05:00
Markolie
2402e91028 Blob event fix, give ERT bowmans 2015-01-17 06:04:24 +01:00
Fox-McCloud
6125a4a6f5 Merge pull request #181 from Markolie/master
Listening Post fix, typo fix, mapfix
2015-01-16 23:18:21 -05:00
Markolie
b58b469a20 Obese psych fix 2015-01-17 05:06:01 +01:00
Markolie
6dbb4c4881 Listening Post fix, typo fix, mapfix 2015-01-17 04:28:35 +01:00
Fox-McCloud
ad1614f737 Merge pull request #180 from Markolie/master
Shuttle fixes
2015-01-16 20:39:03 -05:00
Markolie
fde761f42a Rejuv fix 2015-01-17 02:37:46 +01:00
DZD
0dd49f9f14 Minor Fix for the Wiz Clothing Restriction Removal
- Remove Clothing Restriction now properly uses 2 spell slots instead of
1.
2015-01-16 20:35:19 -05:00
Markolie
fb7fc04f51 Shuttle fixes 2015-01-17 02:33:19 +01:00
Fox-McCloud
a1b5c0d609 Merge pull request #179 from Markolie/master
Bug fixes
2015-01-16 19:09:16 -05:00
Markolie
6737472a83 Cig fix 2015-01-17 01:06:53 +01:00
Markolie
b9ccb857d0 Energy gun description fix, UO45 fix, temporarily disable the engi shuttle 2015-01-17 01:05:23 +01:00
DZD
5a04ea1a79 Spelling Consistency Fixes AGAIN
This time without compiler-breaking #include statement changes.
2015-01-16 17:26:40 -05:00
DZD
002edceacc Revert "Spelling Consistency"
This reverts commit 3635367e03.
2015-01-16 17:20:21 -05:00
DZD
3635367e03 Spelling Consistency
Undoes changes made to spelling of the word "artifact/artefact" in order
to maintain parity throughout the spellbook, or at least the bits that
the user can see.
2015-01-16 17:10:34 -05:00
DZD
3939abaf5d Fix Conflicts and Sync with Upstream
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
DZD
475ca3f666 Wizard Update Part 8
- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)
2015-01-16 16:39:12 -05:00
Markolie
28d55b9b42 Labor ore chance changes 2015-01-16 22:34:19 +01:00
Markolie
f9494d0d31 Revert horsemask.dm 2015-01-16 22:01:09 +01:00