Commit Graph

636 Commits

Author SHA1 Message Date
Bjorn Neergaard 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Razharas ad1c333e89 Fixes bible producing unlimited stuff
Fixes bible producing unlimited stuff
Fixes https://github.com/tgstation/-tg-station/issues/11298
2016-01-17 20:04:26 +03:00
Cheridan 6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor
Refactor the visible_message() proc to be faster in some cases.
2016-01-09 22:16:57 -06:00
KorPhaeron a35cdae739 Fixes grenade kit as well 2016-01-08 16:03:17 -06:00
KorPhaeron b6474aa48f virus 2016-01-08 15:58:35 -06:00
SouDescolado 3b257854f0 Merge pull request #1 from tgstation/master
Merge shit
2016-01-05 14:44:37 -02:00
SouDescolado 92b3c84a22 Make the code beautiful
Less lines, same code.

Trying to fix merge conflict.

Gah
2016-01-05 14:36:39 -02:00
phil235 e225fbc850 - Refactor the visible_message() proc to be much faster.
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
2016-01-04 22:49:27 +01:00
Lularian cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen 3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
Lularian f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
arty23 0e23fdee89 M90gl dufflebag grammar fixed
Issue reported by LanCartwright.
2016-01-01 12:46:23 -06:00
Tkdrg 0b40fe620f Merge remote-tracking branch 'LanCartwright/FIXESBOX' into HEAD
Closes #14225
2015-12-31 21:37:12 -03:00
Akke 6f47f9b5ee fixes items spawning in nullspace 2016-01-01 00:34:57 +00:00
tkdrg 153304ddc8 Merge pull request #14165 from SouDescolado/SouDescolado-patch-1
Stacks the papers inside a folder inside briefcase
2015-12-31 16:07:24 -03:00
tkdrg da97c0fb58 Merge pull request #14107 from LanCartwright/newvirogrenades
Viro-terror grenade renovation
2015-12-31 00:04:38 -03:00
LanCartwright 02dc51db6f Update uplink_kits.dm 2015-12-31 02:17:30 +00:00
LanCartwright fa2276fca6 fixes random tab
actually I hit tab instead of space
2015-12-31 02:13:36 +00:00
SouDescolado b9f7390786 Update briefcase.dm
Fixed bogus
Cookies to travis
2015-12-30 17:50:00 -02:00
SouDescolado 3aa209f2b8 Update briefcase.dm
Complete code overhaul
2015-12-30 17:43:28 -02:00
SouDescolado 66cfbb7316 Fixes folder color. Defined a new briefcase type
Cookies for travis
Need to fix lawyers spawned briefcase. Will try to fix it.
2015-12-30 16:50:56 -02:00
SouDescolado 4f0fc81b44 Changing folder to generic yellow color
Cookies to Travis.
2015-12-30 16:10:58 -02:00
SouDescolado 4d92cb1506 Update briefcase.dm
Removed Law Stamp from briefcases (Not all briefcases spawn at the law office)
Tried to bribe travis with cookies.
2015-12-30 14:12:59 -02:00
SouDescolado 379cdde284 Update briefcase.dm
gah
2015-12-30 14:05:51 -02:00
SouDescolado 4a31ab7b3e Update briefcase.dm
Fixed travis(?), added law stamp to briefcase
2015-12-30 14:00:55 -02:00
SouDescolado 37d8bf27be Update briefcase.dm 2015-12-30 13:48:21 -02:00
SouDescolado 3841d8b8ea Update briefcase.dm 2015-12-30 13:35:00 -02:00
SouDescolado 43bf151814 Stacks the papers inside a folder inside briefcase
Briefcases now spawn with a pen and a blue folder, filled with papers, instead of spawning filled with papers.
2015-12-30 13:26:24 -02:00
SouDescolado 9a021cff3d Stacks the papers inside a folder inside briefcase
Makes all paper be neatly stacked inside a folder in the briefcase.
2015-12-30 13:11:04 -02:00
duncathan salt 42d10a22d3 Merge pull request #13926 from Bawhoppen/czechmilitary
Tactical Gear + small changes
2015-12-29 20:43:14 +01:00
Akke ba02c80bdf better be gpd da,m gicco at thos [pomt 2015-12-28 01:33:59 +00:00
Lularian 2f248b4630 assault belt sprite 2015-12-27 11:40:48 -06:00
PKPenguin321 b1d1f7753e fixes santabag/suicide_act
fixes the path for santabag/suicide_act
2015-12-24 19:30:21 -08:00
Lularian f77ac2a14e tactical gear 2015-12-22 13:59:02 -06:00
tkdrg c00e773b6d Merge pull request #13818 from LanCartwright/nukeopsrenovation
NukeOps gun renovation with bundles
2015-12-20 21:59:17 -03:00
Akke 7d5f21259d Changes c90gl to m90gl 2015-12-21 00:30:55 +00:00
LanCartwright b8bdc8fce3 merge error 2015-12-20 21:04:54 +00:00
LanCartwright 986bfc8501 merge error 2015-12-20 21:04:09 +00:00
Akke 12206ae324 Merge branch 'nukeopsrenovation' of https://github.com/LanCartwright/-tg-station into nukeopsrenovation
# Conflicts:
#	code/game/objects/items/weapons/storage/backpack.dm
2015-12-20 21:02:08 +00:00
Akke 060ed21b7c adds so much more shit 2015-12-20 20:59:23 +00:00
LanCartwright d0c4089a33 whoops that was a mistake 2015-12-19 23:08:51 +00:00
LanCartwright bc450c1f76 Update backpack.dm 2015-12-19 22:56:02 +00:00
Akke 3818c227d2 For a 60 crew round, this theoretically allows all operatives to own a gun and some ammo, and still have some points left over for luxuries.
This mainly balances gun prices and adds new bundles
2015-12-19 22:44:49 +00:00
bgobandit 342ca5098c adds christmas related suicide messages 2015-12-19 03:00:59 -05:00
KorPhaeron a5fb122f49 The Mulligan
A syringe which completely randomizes your name and appearance.
Traitor only, and in the spy bundle.
2015-12-17 00:14:18 -03:00
Razharas a349a15469 Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
Tkdrg 8ead3e8628 Cult Overhaul
Cult is awful, so let's try to improve it. Idea by KorPhaeron. I also
took some inspiration from adrix89's sacrifice cult, so credits to him.
Also thanks a lot specially to MrPerson and Iamgoofball for helping
me brainstorm this, and Joan for the sprites for the summoning orb,
the large nar-sie shell, and the new cult antag hud.

Basically, we remove conversion, and turn cult into a magic version of
nuke, with a small team of stealth elite cultists that have to build a
base in the station and sacrifice people in order to build an army of
constructs and get materials to eventually summon Nar-Sie.

Stun talismans and conversion are gone. Nar-Sie is now the only
objective. Sacrifice runes now provide summoning orbs, which you can use
to drop a large shell. Insert enough orbs in the shell and you trigger a
Delta. Defend the shell for 3 minutes and Nar-sie will arise. This shell
is bombproof and singularityproof. It may be summoned up to three times
if destroyed, but you will have to start from the beginning sac-wise.

Runes are now RNG. Each cultist only gets 50% of the runes. Inspiration
is basically The Binding of Isaac here (thank you MrPerson for this!).
Furthermore, many old runes were merged/removed and other new ones were
added. Almost all were massively rebalanced. Cult now also has a
stealthy ritual dagger with high bleeding and throw effects.
2015-12-15 04:59:31 -03:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
KorPhaeron 50e4e77250 Fixes UI stuff 2015-12-09 21:37:18 -06:00
duncathan salt bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00