Commit Graph

21717 Commits

Author SHA1 Message Date
MMMiracles
68edcb4c2b Merge branch '1handed' of https://github.com/MMMiracles/-tg-station into 1handed 2015-12-17 21:08:52 -05:00
MMMiracles
4540c4e06f typepath fixes 2015-12-16 21:18:20 -05:00
MMMiracles
cbc9904c4c saw balance 2015-12-16 20:23:03 -05:00
MMMiracles
cc7ac6c518 exo grip is rip, final changes. 2015-12-16 20:14:23 -05:00
MMMiracles
7145fd6cf2 incen shots, attempt at some sort of exo-grip attachment please help 2015-12-14 23:37:18 -05:00
MMMiracles
72af408f19 see-saw 2015-12-14 18:28:52 -05:00
MMMiracles
6aac2874ac good 2015-12-13 23:05:46 -05:00
Cheridan
ff2bc4d022 Merge pull request #13529 from KorPhaeron/tele_ops
Ops can't fly to abandoned satellite or derelict
2015-12-13 20:58:40 -06:00
Cheridan
1e4b902ab1 Merge pull request #13595 from Menshin/broken_solar_fix
Fixes broken solar devices giving intact sheets back on deconstruction
2015-12-13 17:43:46 -06:00
Cheridan
ef989fe1dc Merge pull request #13589 from Menshin/atmos_disconnect_runtime_fix
Fixes runtimes on unary atmos devices rotation
2015-12-13 15:09:30 -06:00
Cheridan
bc164c9498 Merge pull request #13582 from Incoming5643/Ill_turn_this_game_into_a_shitty_F2P_korean_MMO_yet
[RPG Loot Intensifies]
2015-12-13 15:04:53 -06:00
duncathan salt
af8e8303ae Merge pull request #13613 from as334/plasmic
Prevents trace amounts of plasma fusing at room temperature
2015-12-13 14:54:37 -06:00
as334
cf9c1daf92 Haha whoops 2015-12-13 15:47:31 -05:00
Cheridan
176967a84d Merge pull request #13594 from swankcookie/Alert_fix
Removes the word "gas" from the oxy alert
2015-12-13 14:36:40 -06:00
duncathan salt
08a62ec85f Merge pull request #13593 from as334/plasmic
Adds a new gas reaction, plasmic fusion.
2015-12-13 13:46:33 -06:00
Cheridan
ca7aa2283b Merge pull request #13587 from Menshin/negative_temp_freezer_fix_again
Fixes upgraded freezer going into negative Kelvin temperatures
2015-12-13 10:41:02 -06:00
Cheridan
1019b057c5 Merge pull request #13557 from bgobandit/nanomedfix
Wall-mounted nanomeds no longer have more contents than the Nanomed Plus.
2015-12-13 00:04:25 -06:00
Cheridan
dff14aa0f9 Merge pull request #13563 from RemieRichards/snipper_wiffle
Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink.
2015-12-12 23:55:55 -06:00
Cheridan
6a9a5c820e Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
duncathan salt
d228f911fa Merge pull request #13522 from KorPhaeron/just_an_illusion
Reactive Illusion Armour
2015-12-12 19:07:30 -06:00
Cheridan
0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
Cheridan
91c3d79f09 Merge pull request #13524 from KorPhaeron/heavy_weapon
Slowdown from inhand items
2015-12-12 18:17:47 -06:00
swankcookie
5328dc8271 added "breath" 2015-12-12 17:43:01 -06:00
Menshin
5142a97d0e Fixes broken solar devices giving intact sheets back on deconstruction. 2015-12-12 23:40:49 +01:00
swankcookie
b95c5e6c00 removed "gas" 2015-12-12 16:39:08 -06:00
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
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
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
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
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
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