Commit Graph

12467 Commits

Author SHA1 Message Date
Cheridan 76ac529d1b Merge pull request #13568 from KorPhaeron/leap_fix
Hunter leap fix
2015-12-12 12:58:10 -06:00
Cheridan 99e7506731 Merge pull request #13572 from KorPhaeron/creepy_crawly
Various Spider Fixes
2015-12-12 12:43:03 -06:00
Cheridan 92dcb09fff Merge pull request #13565 from Incoming5643/my_curse_MY_CURSE
I fudged fudge dice
2015-12-12 12:40:46 -06:00
Remie Richards 36d2f54c69 Zooming is now a /gun level ability, enable-able at gun creation via a "zoomable" var, Zooming can be properly enabled externally by calling the build_zooming() proc on any gun. 2015-12-12 15:26:17 +00:00
bgobandit fb65beeb7c fixed icon paths, edited sprites 2015-12-12 10:03:52 -05:00
AnturK ec85d5ceec Fixes beam crossing
Adds Medbeam gun to Nukeop Uplink
Adds Medbeam gun to ERT medic equipment
2015-12-12 12:26:37 +01:00
bgobandit 112dc6c6f6 adds feature inheritance, fixes recipe 2015-12-12 02:40:23 -05:00
KorPhaeron 1f09a14f58 Merge remote-tracking branch 'refs/remotes/tgstation/master' into reactive_expansion
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
2015-12-12 01:12:59 -06:00
KorPhaeron 09c95d9551 Grenades, flamethrowers, better shields 2015-12-12 00:34:04 -06:00
MMMiracles 50db868f63 lets try that again 2015-12-11 22:54:07 -05:00
Incoming 4c909afb08 The commit so nice I did it twice 2015-12-11 20:22:10 -05:00
Incoming fdc87e9324 Replaces the armor bonus with something that should actually work 2015-12-11 20:12:21 -05:00
Incoming 7ce9267a7d The much beloved rpgloot wizard event has been intensified. Modifiers on items can now range between -15 and +15, though items will follow a normal distribution centered around 0. See the PR for exact odds.
Additionally items armor values are now also affected by this event, and can add (or remove) up to 15 percent damage from all (defend-able) sources.

Additionally a special new gimmick has been added, new "item fortification scrolls" will be thrown randomly into all containers with room to hold them (read: this mostly means things like backpacks). Using these scrolls on items allows you to rank them up one level (this doesn't change their name though, trust me it's too much to do for a silly event).

BEWARE however that using these scrolls on items with very high modifiers (+10 or more) has a chance of failing and setting fire to the item. The highest possible modifier you can achieve with these scrolls is +19, though again the grand majority of items will burn well before this point.
2015-12-11 19:32:32 -05:00
bgobandit 5fa93e0e55 Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats. 2015-12-11 19:03:09 -05:00
Cheridan 6fa38380ae Merge pull request #13503 from KorPhaeron/reactive
Fixes all clothing having a chance to block thrown items
2015-12-11 17:46:01 -06:00
Cheridan a5d6d832f8 Merge pull request #13553 from AnturK/cant_say_no_to_probing
Fixes Abductor event firing up multiple times
2015-12-11 17:18:46 -06:00
Cheridan 78093c0bf0 Merge pull request #13556 from bgobandit/matsagainfuckina
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
The-Albinobigfoot a54c9632fa Shadowpeople (i.e. ???) born of the Wish-granter can now properly see in the dark as (presumably) intended
🆑
bugfix: The Wishgranter now displays its faith in humans with a bit less enthusiasm.
/🆑
2015-12-11 13:52:12 -08:00
MMMiracles b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
Razharas 7929c027fa Merge pull request #13550 from Incoming5643/new_wizard_meta_just_look_for_the_people_who_arent_fucked_up
Apprentice clean up / bugfixes
2015-12-11 22:50:46 +03:00
Razharas 850f8c6792 Merge pull request #13538 from Incoming5643/no_a_blob_didnt_spawn_stop_asking
Fixes false alarm picking late round exclusive events early
2015-12-11 22:48:12 +03:00
Razharas 5b5e48bad8 Merge pull request #13526 from Lo6a4evskiy/ninja-fixes
Fixes ninja suit not draining energy after running out of it once
2015-12-11 22:44:55 +03:00
Razharas 550d7779eb Merge pull request #13514 from tkdrg/dadadaDADADA
Fixes human canUseTopic() misbehaving
2015-12-11 22:43:36 +03:00
Razharas 83bb88868c Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles
Unifies energy gun self charging
2015-12-11 22:38:07 +03:00
Remie Richards da295d9f9f Computer ID is a string, Thanks byond.
I chose text2num() over putting the integer max in quotes since I believe text2num() is nicer than doing a string comparison.
2015-12-11 18:08:19 +00:00
Remie Richards 0ae0f84325 Revert "[s]Fixes the logic of IsBanned and bad CIDs" 2015-12-11 17:49:30 +00:00
Remie Richards 1efcc64990 Fixes the logic of IsBanned and bad CIDs
the bad CIDs aren't perfectly the Integer max, they're above it.
2015-12-11 17:27:42 +00:00
Cheridan de914590fa Merge pull request #13544 from KorPhaeron/survival
Adds survival capsules to pod safes
2015-12-11 10:26:04 -06:00
Remie Richards a49fdc0cc7 Allows the sniper rifle to be suppressed and unsuppressed. 2015-12-11 15:22:47 +00:00
Remie Richards 3b1afe46f2 Reallows Noscopes, Losing the weapon/Being stunned/Dying correctly unzooms you. 2015-12-11 15:10:09 +00:00
Cheridan a002ca8917 Merge pull request #13542 from KorPhaeron/gigantic_epipens
Fixes small objects covering the entire tile after a fire
2015-12-11 07:23:00 -06:00
AnturK f333562223 Adds Med Beam Gun 2015-12-11 12:01:28 +01:00
KorPhaeron 44873907f4 More spider fixes 2015-12-11 04:42:04 -06:00
KorPhaeron 6880b68269 Spiders in the dark 2015-12-11 04:33:57 -06:00
KorPhaeron 24e4792d75 Gate Fix 2015-12-11 04:26:23 -06:00
KorPhaeron 25a3010551 Leap fix 2015-12-11 00:58:52 -06:00
KorPhaeron 36c45e0247 Starting work, I'll finish this later maybe 2015-12-11 00:53:17 -06:00
Jordie d7e7ef9280 Update energy.dm 2015-12-11 16:25:16 +11:00
Jordie0608 7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
2015-12-11 15:59:46 +11:00
MMMiracles d61d655076 oh my 2015-12-10 23:14:42 -05:00
Incoming a5aa452c2b I fudged it 2015-12-10 22:22:22 -05:00
Remie Richards bc561789c2 Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink. 2015-12-11 01:30:14 +00:00
bgobandit 83fd94a507 fixes honkworthy typo, ups chainsaw success chance, adds color inheritance 2015-12-10 19:49:46 -05:00
bgobandit 73471eb8b1 sexy clown is now a sexy object oriented clown 2015-12-10 19:19:03 -05:00
bgobandit 49d54f48f7 Adds the severing of lizard tails. 2015-12-10 18:58:37 -05:00
bgobandit b4270d862d Empty syringes no longer appear to have a fill. 2015-12-10 16:47:20 -05:00
Cheridan 76f05602fa Merge pull request #13523 from KorPhaeron/stat_attack
Fixes syndicate mobs not attacking unconcious people
2015-12-10 15:42:03 -06:00
bgobandit 92d86dd369 Adds mats/origintech/burn_state to more items. 2015-12-10 15:32:28 -05:00
bgobandit 5f293c1d2b The sexy clown jumpsuit now reacts properly on hit. 2015-12-10 15:09:51 -05:00
bgobandit 01dd491390 Fixes various mining bugs. Adjusts gear costs. 2015-12-10 14:43:33 -05:00