Commit Graph

191 Commits

Author SHA1 Message Date
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Miauw 8859801ef2 Merge branch 'master' of https://github.com/tgstation/-tg-station into neonewling
Conflicts:
	code/game/gamemodes/changeling/powers/humanform.dm
2015-08-13 12:14:52 +02:00
Xhuis e370d89ca3 Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-04 14:48:35 -04:00
Jordie d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
Xhuis d1ceb296be Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-03 16:37:06 -04:00
Xhuis 4cefd114c5 Shadowling update 3 2015-08-03 16:35:42 -04:00
c0 667d5e75c3 Transferred body eggs to new organs system 2015-08-03 23:24:17 +03:00
Miauw 865f4aacc9 New enhanced changeling transform actually works! Somewhat! 2015-08-01 18:14:43 +02:00
Miauw e333137e05 makes new ling transform compile. not sure if it works, though. 2015-07-31 19:01:25 +02:00
bear1ake 5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
MrPerson 471d69fcf7 Change many ERROR() calls into thrown exceptions
This requires a 508 beta version to use. If Travis fails this he's a bitch

Exceptions will generate a stack trace, which is way easier to see and more helpful in actually solving this kind of crap. Also logs all the arguments, src, line, and file automatically.
Removed any dubiously helpful information in the exception names so the runtime condenser won't see each one as a different runtime. If the information is critical to solve these bugs (camera one maybe?), then I'll just make these warnings.
Thrown exceptions crash the currently running proc. Yes that means there's useless returns in a bunch of these, sue me. spawn()'s are to let the proc continue.

Almost all of these are difficult to trigger, but I did test playsound. And frankly even if they do cause bugs by crashing procs, big whoop
2015-07-23 08:19:08 -07:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Ikarrus 7d0e61540c Gang Mode Update
- Fixes round-end message always declaring both gangs lost
- 3gang is now twice as likely to appear
- Purchased spray cans will always be the gang's color
2015-07-08 16:35:11 -06:00
Cheridan 65484c6457 Merge pull request #10419 from Ikarrus/gangbadmin
Fixed Badmins being able to exceed the gang limit with excessive buttons
2015-07-07 08:57:30 -05:00
Cheridan fca65649ab Merge pull request #10402 from Ikarrus/ninjacodeayy
Gives the Capture objective a better description.
2015-07-07 07:48:26 -05:00
Ikarrus d3ea1c7902 Fixed Badmins being able to exceed the gang limit with excessive button pressing 2015-07-06 00:05:59 -06:00
Ikarrus 792720848d - Reverted the change that made the traitor panel even harder to read
- Fixed a runtime with observers during pregame
2015-07-05 20:51:32 -06:00
Ikarrus 71a5543976 Nazism 2015-07-05 11:36:29 -06:00
Ikarrus 737783b084 Update 2015-07-05 00:32:13 -06:00
Ikarrus 3c6398bd46 Gives the Capture objective a better description.
Because what the fuck is a capture point?
2015-07-05 00:19:05 -06:00
Ikarrus 97b8286a00 Fixes some bugs introduced by Datum Gangs
- Fixes Quick-Create Gang button
- Fixes bosses unable to promote lieutenants
2015-07-03 12:37:52 -06:00
Ikarrus 3814dc208a Gang-Based Datums 2015-07-02 22:18:11 -06:00
Ikarrus 2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
Incoming 69f8f6575b Antagonists Will No Longer Show Up as MODE in round end reports.
Instances where the game would give special treatment to MODE players will instead check to see if a player's assigned_role (job) matches their special_role (antag status). All antags that start off station (as well as ninjas for some weird reason) were affected.

Fixes #8743
2015-05-25 15:58:32 -04:00
Ikarrus b275b73597 Fixes Quick-Create Gangs button not working 2015-05-10 17:56:42 -06:00
phil235 1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
Group of fixes
2015-05-09 16:23:46 +02:00
Jordie0608 f85b3735bd group of fixes 2015-05-07 00:40:26 +10:00
Incoming 23cc8c7db0 All modes now choose their antagonists before they choose jobs. A new mind attached list, restricted_roles, will keep incompatible jobs out of rotation.
Players who would otherwise qualify to play as an implanted job will spawn as the most wanted not implanted job they qualify for if they are an onstation antagonist. If they don't qualify for any job in this way depending on preferences they will either spawn as an assistant or a random job (which also makes sure they don't end up in an incompatible job).

Note this doesn't impact late join antagonists or mulligan antagonists. Roundstart only.
2015-05-05 23:29:03 -04:00
AnturK 34437dffb6 - Makes additional batons cost 2 experiment points.
- Fixes typo in floors.dmi
- Traitor panel buttons now grant objectives as well
2015-05-02 12:57:49 +02:00
AnturK 0115296a86 Fixes alien table icon 2015-05-02 12:54:53 +02:00
AnturK a92b3b24e4 - Adds make abductor buttons on traitor panel
- Fixes clotheless surgery
2015-05-02 12:54:52 +02:00
Ikarrus c771d30986 Gang Mode Update 4
**Major Changes**
- Increased win condition to require 66%
- Added a switchblade. A relatively cheap and decently robust melee weapon for gangsters.
- Capped how much influence you can get every income at 50
- Limited gang spraycan use to 15
- Pistol cost increased to 30 Influence
- Promotion cost now scales to how many bosses you already have. The more bosses, the more expensive it will be. It starts off cheap at 20 influence now.

**Minor Changes**
- Tagging a territory now tells you what territory you actually tagged!
- Added an option to silence the verbose territorial updates you get from gangtools
- Capped how much influence you can get every income at 50
- Updated Centcom report on gangs
- Spraycans always show their inhands now, instead of only when uncapped
- Antag panel now shows how much influence each gang has
- Cleaned up gang code in the traitor panel
- Fixed non-gangers getting gang messages when trying to spray on an invalid territory
2015-04-21 23:23:15 -06:00
Ikarrus af7131c7ad Gang Update v3
The coding isn't done yet, but the design is. So comment on the design while I smooth out the code.

tldr; Gang mode rewrite to follow my original vision: Slower and longer rounds with less deathmatching, and a resource both teams have to fight over

NEW OBJECTIVE: CLAIM HALF THE STATION AS TERRITORY
- Gang bosses can spawn special spray cans that can be used to tag areas
- Any gang member can tag areas.
- Gang tags must be removed before another one is placed in the same area
- Game mode no longer automatically ends when the boss dies. It now ends when either the station evacs, or one gang claims more than 50% of the station areas
- Boss can promote gangers into his lieutenants, which basically means adding more bosses
- Lieutenants can do anything bosses can except promote others to lieutenant

NEW RECRUITMENT TOOL: PENS
- Recruitment pens replace flashes
- Looks exactly like a pen. Stab people to recruit them.
- Recruitment is silent but obvious to the perceptive (Causes a brief seizure)
- Cooldown between uses that gets longer as the gang gets larger

NEW TOOL: GANGTOOL
- Replaces the recaller device. Can still recall the shuttle.
- Provides overview information about the gang (membership size, income amount and time)
- Can spawn pistols and ammo
- Can spawn additional recruitment pens
- Can spawn additional gangtools (For personal use, or promoting a single ganger to lieutenant)

NEW CURRENCY SYSTEM: NAME IS WIP
- Gangtools purchase items with new currency with the placeholder name "Supply Points (SP)"
- Supply points are collected every 5 minutes. The more territory a gang has claimed, the more points they get.
- Supply points are accumulated per-gang. Having more gangtools does not intrinsically give you more points to use.
2015-04-19 01:00:17 -06:00
Xhuis 7b5760f6d3 Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1 2015-04-13 16:47:00 -04:00
Xhuis 9c752683ef Shadowling update one 2015-04-13 16:46:49 -04:00
Jordie ae120db87c Merge pull request #8728 from AnturK/action_button
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
Xhuis 6375286704 Fixes admin shadowlings not getting Enthrall 2015-04-11 14:57:14 -04:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
AnturK f0bc1cc70c - Adds action buttons for aliens 2015-04-11 17:06:44 +02:00
AnturK e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
hornygranny 14fa16078f Merge pull request #8368 from Cheridan/day1
Spring Event Day 1: Martyr Objective!
2015-03-23 17:15:55 -07:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Cheridan 7149f0382d Adds Pet Collars!
Map needs update now
2015-03-18 21:27:21 -05:00
Cheridan 2ca9e8e392 Spring Event Day 1: Martyr Objective! 2015-03-15 22:50:25 -05:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
phil235 29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00