Aranclanos
e016275408
Merge pull request #13459 from duncathan/ohgodimdoingitimactuallytouchinggascode
...
Small cleanup of gas_mixture.dm
2015-12-12 19:29:08 -03:00
duncathan salt
e97f647158
Merge pull request #13499 from AnturK/turretfix
...
Fixes syndicate turrets shooting after breaking
2015-12-12 14:54:19 -06:00
bgobandit
7d7468efe6
fixes honkworthy oversight
2015-12-12 15:38:40 -05:00
bgobandit
c1e2f9b436
missing copy proc
2015-12-12 15:22:18 -05:00
bgobandit
0b505eeff0
cloning buffer
2015-12-12 15:15:34 -05:00
as334
80f4b0b1b0
Fixes my numerous errors(you saw nothing)
2015-12-12 15:07:42 -05:00
as334
79233e178a
Merge branch 'master' of https://github.com/tgstation/-tg-station into plasmic
2015-12-12 14:53:28 -05:00
Menshin
9262d81ad4
Fixes freezer going into negative Kelvin temperatures ( fixes #13583 ).
2015-12-12 20:43:26 +01:00
Cheridan
5dcc208ee2
Merge pull request #13569 from KorPhaeron/low_layer
...
Fixes girders being on a low layer
2015-12-12 13:01:32 -06:00
Cheridan
45c06ae2cd
Merge pull request #13555 from bgobandit/sexyhonk
...
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
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
as334
8f2d65c446
Adds a new gas reaction, plasmic fusion.
2015-12-12 12:32:28 -05: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
Menshin
92b334b027
Fixes runtimes on unary atmos devices rotation.
2015-12-12 16:13:30 +01:00
bgobandit
fb65beeb7c
fixed icon paths, edited sprites
2015-12-12 10:03:52 -05:00
Lo6a4evskiy
62d4bd604d
Refactor quick-equip verb
2015-12-12 16:29:24 +04: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
duncathan salt
9716702fb6
Merge pull request #13537 from KorPhaeron/work_place_hazard
...
Standing between activating shield generators is now deadly
2015-12-11 18:29:54 -06:00
KorPhaeron
bce927ef72
Removes syndicate destinations
2015-12-11 18:17:26 -06:00
KorPhaeron
f5c35298c9
Visible message update
2015-12-11 18:03:38 -06: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
Nerd Lord
b274d3ddc5
Dualsabers will now make you flip only twice, instead of up to twelve times.
2015-12-11 18:33:00 -05:00
Cheridan
c641643c55
Merge pull request #13539 from KorPhaeron/dance_moves
...
Hitting someone with a dualsaber now has a chance to make you *flip
2015-12-11 17:27:42 -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
AnturK
2c9c4f7a0a
Adds Cloaker Belt
2015-12-11 20:50:09 +01: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
a251002d6f
Merge pull request #13532 from Jalleo/pAI
...
Personal Artificial Intelligence Fix
2015-12-11 22:46:24 +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
767061a163
Merge pull request #13541 from Anonus/prefv
...
Fixes revenant antag pref being impossible to toggle.
2015-12-11 18:15:12 +00:00
Remie Richards
53172fa9ce
Merge pull request #13516 from Anonus/whymode
...
Fixes up blob code some
2015-12-11 18:14:56 +00: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