Commit Graph

2074 Commits

Author SHA1 Message Date
Aranclanos d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Aranclanos a5571508d0 Merge pull request #2049 from Incoming5643/wands3
Magic Mania: Sprites, Fixes, Balancing, and Mini-Features
2013-12-29 11:47:59 -08:00
Incoming 47ba33c50c Removes a pair of well meaning but apparently poorly realized code fixes for edge cases. 2013-12-29 13:46:29 -05:00
Robson Richards d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
Giacom 46a6830dec Merge pull request #2148 from ACCount12/master
Space Retrovirus fix
2013-12-29 02:57:39 -08:00
Incoming 392c6d51a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 2013-12-27 02:33:47 -05:00
Cheridan 7c2fbba76f Merge pull request #2111 from Perakp/voiceChangerFix
Voicechanger fix
2013-12-26 22:06:38 -08:00
Incoming 26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
ACCount 15ef414627 Viral fix
Fixed strain_data, removed some unused code.
2013-12-27 17:43:26 +12:00
Cheridan f36a7d764c Merge pull request #2110 from Perakp/mimeSpells
Changes mime abilities into spells
2013-12-26 20:56:40 -08:00
Cheridan 4f144e0111 Merge pull request #2130 from Giacom/gib_refactor
Refactored gib() and dust()
2013-12-26 20:34:50 -08:00
Giacomand 173e1cb391 * Refactored gib() and dust()
* Refactored ex_act(), for mobs, a little.
* Removed the code which gibbed dead bodies with any severity.
2013-12-23 17:56:58 +00:00
Giacom 38e0ae8848 Merge pull request #2019 from Jordie0608/Dogmas
Added reindeer hats
2013-12-23 04:18:42 -08:00
Aranclanos 40929b37d3 Merge pull request #2093 from Giacom/small_fixes_and_tweaks
Small Tweaks and Fixes
2013-12-21 15:12:01 -08:00
Aranclanos e7579e2aa8 Merge pull request #1986 from Perakp/janitorCartFix
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
Giacom 9d24a900ae Merge pull request #2066 from Perakp/slipFix4
No slipping when lying down
2013-12-21 13:54:39 -08:00
Giacom bcfcb3a9cf Merge pull request #2073 from Jordie0608/ShakeTheRoom
Gibbing borgs explode violently
2013-12-21 13:42:59 -08:00
Perakp b1996a77e1 Fixes AI seeing the name of the person who speaks over radio using a voice changer. 2013-12-21 23:01:52 +02:00
Perakp 0d1ba1eccf Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned. 2013-12-21 20:54:07 +02:00
Perakp 65e0931d55 Merge branch 'master' into janitorCartFix
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
Incoming 2b827e3592 Bugfix: Slimes that reproduce will now properly inherit magic spells 2013-12-21 02:08:21 -05:00
Cheridan 046714d864 Merge pull request #2092 from Giacom/grab_monkey
Monkeys no longer wander off when being pulled or grabbed.
2013-12-20 11:44:25 -08:00
Incoming a73721f7a1 Fixes for Gia:
Fixes the mysteries of reviving simple animals in the least intrusive manner I could think of
Removes player_controlled because ckeys did much the same thing
Uses update_canmove() instead of hardseting it

One last Bugfix: Simple animals generated with no real_name will use their initial name as their real name so that transformed antags will not get a "(survived as )" because the thing they turned into didn't have a real_name set.
2013-12-19 21:49:15 -05:00
Giacomand 80f2076bcc * Fixed the party alarm from only working in areas with a certain light level.
* Reduced a lot of duplicated code in the party alarm.

* Added a shield range variable for the anti-breach shield generators.
* Changed the shield range to 4, making them more useful.
* Fixed a bug with the deployed_shields list not being cleared after the shields are down.

* Fixed a runtime with shake_camera()
2013-12-19 22:07:52 +00:00
Giacomand c917999f2f * Monkeys no longer wonder off when being pulled or grabbed.
* Fixed the grabbed_by list not being emptied when the grab is deleted.
 * Removed duplicated use of grabbed_by.
 * Undef'd defines which are only used in a single file.
2013-12-19 20:41:19 +00:00
Incoming 689aecc336 I forgot how children work guys
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-19 15:07:59 -05:00
Cheridan 8ba3859b2d Merge pull request #2069 from Aranclanos/pAIBioscan
pAI bioscan runtime fix
2013-12-19 10:41:07 -08:00
Incoming ac1a96fd43 feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).
bugfix: gives notransform to etheral jaunting based on an observed edge case where a wizard was staff of changed while starting a jaunt and got stuck in bluespace for the rest of the round

meta: modified revive() so I could remove all that horrible snowflake I introduced to let reviving simple mobs come back
2013-12-19 11:50:33 -05:00
Jordie0608 33a315a111 Switched position with gib 2013-12-19 12:48:14 +11:00
Perakp 2f70aaadb3 Removes magic numbers and an useless check
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
Perakp 68ff764463 Subtypes of janiborg tools
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
Jordie0608 8da1ab8641 Gibbing borgs explode violently. 2013-12-19 05:31:15 +11:00
Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Incoming 45e89b5190 Bugfix: Adds a var to simple animals "player_controlled" to surpress behaviors in simple_animals that have players assigned.
Bugfix: Dead player mice won't be converted to items so they can still be revived.
Bugfix: Players playing chicks won't die by developing into chickens anymore
Bugfix: Fixes an edge case where a poor soul struck by multiple polymorphing shots at once ends up in a state where they can't move.

Feature: Renames the wand of resurrection to the wand of healing to drive home the fact that it does the same things the staff of healing can do

Balancing: Gives the wand of healing more shots. 10, 5, 5, 4 up from 3, 2, 2, 1
2013-12-18 12:28:38 -05:00
Aranclanos 0a18229abd pAIs won't runtime anymore if they try running a bioscan while lying on the floor 2013-12-18 13:12:59 -03:00
Perakp b4c8f4ccf3 I spend four hours merging my commits and I find this
- if it was any other programming language it wouldn’t have even
compiled.
2013-12-18 15:10:28 +02:00
Perakp b54cab665a No slipping when lying down
- No slipping when lying down
- Doesn’t change slipping mechanics otherwise.
2013-12-18 15:03:03 +02:00
Razharas 358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Razharas f2e0e5a193 Fixed minor typos and more use of new proc
Removed previously added ling logging proc, replaced with new one
Fixed some language
Fixed help and grab intent logging when you do it to yourself
2013-12-15 20:58:28 +04:00
Giacomand 1c5126fc98 Removed ONESIZEFITSALL.
Changed the THICKMATERIAL flag so it did not conflict with HEADCOVERSMOUTH.
2013-12-15 15:58:55 +00:00
Razharas 4dfbe1cbf7 Mistook the mobs in human_attackhand, fixed now
Happy little accident
2013-12-15 07:26:54 +04:00
Razharas 5045069899 More logging and fingerprints
Added helper proc for general logging, replaced some logging with this
proc
Pulling now leaves fingerprints
Judging by the opinions in the thread will add some more
logging/fingerprints
2013-12-15 05:23:50 +04:00
Giacomand 4b4735fb22 Made changes based on feedback.
The pen/hypo/borghypo doesn't give a poke message when it fails to inject someone wearing protective gear.
Fixed a typo.
Reworded the can_inject() error message for humans so it makes sense with a normal pen.
Made the combat hypo (nuke ops item) ignore protective gear, to allow syndies to heal their comrades.
2013-12-13 22:51:44 +00:00
Aranclanos 3e54ed6d54 Merge pull request #2017 from Giacom/screen_shaking_fix
Fixes the screen shaking from having your camera get stuck on a turf.
2013-12-13 13:50:51 -08:00
Giacom 7473950247 Merge pull request #1996 from Incoming5643/happyholidays
[map] Do they know it's Christmas time at all?
2013-12-13 13:30:24 -08:00
Giacomand ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Giacomand 130803fcd9 * Added the THICKMATERIAL flag. It is used for thick coverall suits (space suits, firesuits, etc) and it will stop injections from syringes, hypos and parapens. It is also used for head items such as biohoods and space helmets. If you aim for the head, it will check if you can inject through the head equipped item, if you aim anywhere else it will check the external suit.
Let me know if I missed an item or if you don't think an item should have the flag.

* Cleaned up a bit of the gun code.
* Fixed an issue with shotgun darts not working in barrel shotguns.
* Made the on_hit() have a zone, will be used for syringe guns in another PR.
* Removed the unused sleepy pen.
* Changed /obj/item/weapon/gun/projectile/shotgun/pump/sc_pump to /obj/item/weapon/gun/projectile/shotgun/sc_pump, there was no /pump/ anywhere else.
* Shotgun darts will follow the new flag.
* Shotgun darts are now open containers, and I removed the snowflake check for them in syringes.
* Added logging for reagents in any projectile.
2013-12-13 00:00:20 +00:00
Jordie0608 87b5161e28 Removed incorrect speak, changed see and hear emotes 2013-12-11 17:33:59 +11:00
Jordie0608 9197bff4dd Added reindeer hats for humans and corgis 2013-12-11 16:11:01 +11:00
Giacomand 92480d60b4 Fixes the screen shaking from having your camera get stuck on a turf. 2013-12-11 04:17:46 +00:00