Commit Graph

16141 Commits

Author SHA1 Message Date
phil235 c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
Cheridan f454e4d113 Merge pull request #9151 from balohmatevz/patch-2
Fixes round population statistics tracking
2015-04-26 14:31:02 -05:00
Cheridan 6bce2db70d Merge pull request #9159 from Ikarrus/gang5
Gang Update 5
2015-04-26 14:29:50 -05:00
phil235 bab61203de Merge pull request #9090 from RemieRichards/PortVGVentcrawling
Ports VG's ComicIronic's awesome ventcrawling overhaul.
2015-04-26 20:49:35 +02:00
Remie Richards 504a139364 Reworked remove_ventcrawl() to be safer 2015-04-26 19:14:56 +01:00
Remie Richards 95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
Remie Richards 3b14aca5ae Merge branch 'master' of https://github.com/tgstation/-tg-station into PortVGVentcrawling
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-04-26 15:31:45 +01:00
phil235 d66e5bb7b3 Merge pull request #9153 from Iamgoofball/patch-59
Resets Styptic and Silver Sulf back down to the default metabolism rate
2015-04-26 13:01:52 +02:00
phil235 1b7c14fa2f Merge pull request #9154 from Iamgoofball/patch-60
Buffs Charcoal and Silver Sulf.
2015-04-26 12:49:11 +02:00
AnturK f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
Ikarrus a46d79245c Squashed commits. You can see what they do in the first commit/PR desc 2015-04-25 14:05:30 -06:00
phil235 16a681cda1 Merge pull request #9144 from Incoming5643/communism_joke
Latejoin Rev Head: Fix n' Tweak
2015-04-25 20:21:12 +02:00
phil235 2ef588e01d derp 2015-04-25 19:27:20 +02:00
phil235 67a14f4c21 Changed how the bible icon is chosen, it's now done manually by clicking the bible as a chaplain (only work once). 2015-04-25 19:21:32 +02:00
phil235 236db87ac8 Cyborg and AI names are now also chosen in the preferences window, as well as chaplain religion and deity. 2015-04-25 18:28:29 +02:00
Jordie 4e1b27c08b Merge pull request #9135 from Incoming5643/validsalid
Adds Antag Tokens!
2015-04-25 19:14:34 +10:00
Jordie 34c810536c Merge pull request #9124 from naelstrof/master
Fixed being unable to upgrade grabs with hotkey.
2015-04-25 19:14:25 +10:00
Jordie 8ff56a17a1 Merge pull request #9033 from Boggart/guitar
Ports Nienhaus's playable guitar and generalizes instrument code.
2015-04-25 19:13:23 +10:00
Ikarrus e26695b7db Removed unnecessary check 2015-04-25 02:36:59 -06:00
Ikarrus 452bae9c19 - Capture goal reduced to 60%
- You must be in the territory physically to tag it now. So no more tagging everything from maint.
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.

- Removed solars and shuttles, and the toxins test chamber from valid territory list
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.
- You cannot tag tiles with APCs. No cheating, you maint crawlers.
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing them
2015-04-25 02:14:28 -06:00
Ikarrus 7b02a11dc2 Gang Update 5
###Major Changes###
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.

###Minor Changes###
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing people
2015-04-25 01:20:04 -06:00
hornygranny 8e8561eb3e Merge pull request #9108 from Xhuis/revenantExplosionFix
Revenant Update II
2015-04-24 20:04:39 -07:00
Boggart 077051626c Ports Nienhaus's guitar, the additional sounds are about ~1mb.
Moves most of the code from violin up to instrument and makes violin a child of it. (Guitar is a child of it as well.)
Fixes violins on Metastation and Box due to the repath, adds the guitar to both.
2015-04-24 19:12:22 -06:00
Boggart c6a22a98c9 Renames Violin.dm to Instruments.dm in preparation for generalizing the code and to preserve the git history. 2015-04-24 19:12:16 -06:00
Iamgoofball 7611150360 Buffs Charcoal and Silver Sulf.
As pointed out here, after I ran the numbers, I found that Charcoal and Silver Sulf. under-performed compared to their ancestors.
https://tgstation13.org/phpBB/viewtopic.php?f=10&t=3440&p=83903#p83903
2015-04-24 17:45:06 -07:00
Iamgoofball a58227df12 Resets Styptic and Silver Sulf back down to the default metabolism rate
no clue why it was set this high, i mighta been smoking something or some shit idfk
2015-04-24 17:07:39 -07:00
Matevž Baloh de2d1fe5f1 Fixes round population statistics tracking
This commit fixes round end population tracking, originally broken by the commit linked at the end, applied to TGS servers on 11 Jan 2015
https://github.com/tgstation/-tg-station/commit/a029a49392b4708b76f9f4f709d8b707475c04c7
2015-04-25 01:49:45 +02:00
Incoming a5fc495a27 please don't tell anyone I forgot how to spell salad 2015-04-24 17:55:53 -04:00
Cheridan 548e0eb17e Merge pull request #9048 from kingofkosmos/ellipseses
Span class and grammar standardization in messages
2015-04-24 14:10:11 -05:00
kingofkosmos d9b8b146c8 Tried to fix merge conflicts, hopefully worked. 2015-04-24 21:52:36 +03:00
Cheridan d387efd50b Merge pull request #9130 from GunHog/404_Clever_Branch_Name_Not_Found
Adds APC boards to Autolathe!
2015-04-24 13:29:58 -05:00
kingofkosmos 761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Cheridan 30d160b1d2 Merge pull request #9112 from Ikarrus/gang4
Gang Mode Update 4
2015-04-24 12:11:38 -05:00
Incoming cd9669bc76 tweaks the midround rev head promotion to only pick revs that have the flag for roundstart rev head on
fixes a bug that could have led to there being four or five head revs in certain rare(ish) circumstances
2015-04-24 01:22:11 -04:00
Xhuis efac73a72b Fixes indefinite 'draining' var 2015-04-23 21:18:07 -04:00
Xhuis 0798a873f2 Merge remote-tracking branch 'remotes/upstream/master' into revenant_update_ii 2015-04-23 21:17:15 -04:00
Incoming 6e25a57230 Adds Antag Tokens!
They're a novelty coin with a syndie helmet (valid) on one side and a salid (salid) on the other.
Found as a prize in arcade machines, Sec can also get one from their vendor as a premium item.
2015-04-23 19:08:38 -04:00
phil235 88fd7c44cc Changes clown/mime naming to use preferences. Player will now choose their mime/clown name in the main preference screen and save it, instead of at roundstart.
Adding a config file for random mime names.
2015-04-23 23:18:35 +02:00
Swag McYolosteinen 983e306f23 Merge pull request #9069 from Boggart/allowdisposalpipesonwalls
Fixes being unable to construct disposal pipes on walls, an RPD bug and moves it over to the datum/browser ui.
2015-04-23 20:26:16 +02:00
Boggart ecebb594f9 Fixes being unable to construct disposal pipes on walls and fixes changing the RPD settings while already building affecting the currently building pipes.
Changes the RPD to use the newer datum/browser ui, makes it so that it show's what you have picked and doesn't let you endlessly repick it.

Fixes my wonky check for bins/outlets/chutes on walls, also adds a changelog.

Undefs the defines in RPD.dm at the end of the file.

Changes the "Type:" label to "Category:"
2015-04-23 11:53:27 -06:00
Remie Richards 02b8400c1f Ensure Entered() procs are called on exiting pipe system 2015-04-23 18:46:05 +01:00
GunHog cf6e5ff1cd Adds APC boards to Autolathe
- I have also drawn up a changelog, written in my own blood to appease
the God of Changelogs.
2015-04-23 12:44:15 -05:00
Ikarrus d420e3f467 Pistols -> 25 Cost 2015-04-23 09:23:27 -06:00