Commit Graph

603 Commits

Author SHA1 Message Date
PKPenguin321 b1d1f7753e fixes santabag/suicide_act
fixes the path for santabag/suicide_act
2015-12-24 19:30:21 -08: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
octareenroon91 5646f0eb5b syntax error 2015-12-05 18:42:50 -06:00
octareenroon91 3c75d78f84 Use a list instead of net_id
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
Bjorn Neergaard 34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
octareenroon91 544295c563 define proc/refreshID 2015-12-04 03:42:54 -06:00
octareenroon91 f3f61367da Give wallets merged access of all IDs inside. 2015-12-04 03:16:43 -06:00
Firecage c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Torger597 c76a9526d5 Adds a Syringe to the Uplink Poison/Chemical kit
Useful for:
1: Poisoning food.
2: Injecting Chemicals directly rather than being forced to feed someone
from a bottle.
2015-11-09 19:57:28 -06:00
Nerd Lord 0f23809346 Revenant changes XVIII
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
2015-11-05 18:50:51 -05:00
Cheridan b10368c3e3 Merge pull request #12306 from Incoming5643/RTD
Adds d1 and d100 dice
2015-10-25 05:19:17 -05:00
Razharas 6fc19c7c23 Merge pull request #12385 from bgobandit/morexenobioshit
Adds bio-bags, primarily for xenobiologists.
2015-10-19 19:53:45 +03:00
Steelpoint 3662a52eb1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Armoury
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-10-19 02:16:24 +08:00
bgobandit ca7a38eb59 halves storage capacity 2015-10-15 00:43:38 -04:00
bgobandit 9aae866651 le fluff faec 2015-10-14 10:17:14 -04:00
bgobandit cee7614cb7 Adds bio-bags. 2015-10-13 23:06:35 -04:00
Steelpoint ac57b4ee03 InitalCommit 2015-10-12 11:59:33 +08:00
phil235 9c3d5ae3c7 Fixes runtimes with augmented_eyesight refund, atom/movable/Bump(), fleshmend, spraycans, PDA messaging, remove_from_storage(), and gun burstfiring. 2015-10-11 17:18:31 +02:00
Incoming b9d4b8322d Adds d1 and d100 dice
Dice bags will now give you a shuffle of 7 dice from a list of all dice (d1, d2, d4, d6, d8, d10, d12, d20, d100)

Moves dice bags from firstaid.dm to dice.dm
2015-10-10 21:41:29 -04:00
Razharas effae76516 Merge branch 'bundlestuff' of https://github.com/bgobandit/-tg-station into bgobandit-bundlestuff 2015-10-10 02:04:43 +03:00
Swag McYolosteinen 38f5c0c85a Merge pull request #12122 from Steelpoint/Magazine
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
Razharas 653e5d18f3 Merge pull request #12027 from Fox-McCloud/advancedmop
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Steelpoint b5ded1c9e8 InitalCommit 2015-10-03 21:22:29 +08:00
bgobandit 8e82cf324a Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit
Conflicts:
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-10-02 00:41:19 -04:00
bgobandit 26b8112dea Adds additional items to the storage of many coats and oversuits. 2015-09-29 22:29:07 -04:00
Fox-McCloud 960f0b3129 adds in bluespace trashbag 2015-09-26 18:07:16 -04:00
Cheridan e1b16b057c Merge pull request #11964 from Delimusca/durrymunchin
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
unknown e971423dc6 removed targetzone checks from smoking stuff 2015-09-23 15:16:11 -06:00
xxalpha 4d4b8e64c1 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-16 23:14:14 +01:00
Xhuis 1178fbe079 Major cult changes
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
bear1ake c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit f524f5b7e5 Balances syndicate bundles. BOY OH BOY OH BOY 2015-09-10 00:46:50 -04:00
bgobandit b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
Conflicts:
	code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
xxalpha 51934abbc8 Reworked nuke deconstruction. New nuke sprites. More++
Changelog
2015-09-06 21:35:14 +01:00