Commit Graph

65 Commits

Author SHA1 Message Date
Werner
cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
Alberyk
858690a62b Nuke disk fix, preferences fix, bay lore purge and more (#1523)
-may fix #1493
-fix missing the nuke disk being deleted when put inside any container
-fix several references to bay lore, like nyx and etc
-add some missing splint related code
-added fireandglory's hammer weapon to uplink and heist
-tries to unfuck the designs.dm
2017-01-12 23:03:40 +02:00
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
Zuhayr
9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
Zuhayr
3951b1d62c Added a handful of new mixed-antagonist modes. 2015-09-05 18:05:39 +09:30
Zuhayr
89a7c9667b Reverts a testing value. 2015-09-05 17:31:27 +09:30
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
2015-09-05 09:24:30 +02:00
Zuhayr
553ac01552 Autotraitor cleanup. 2015-09-04 20:17:47 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta
99ba26f1ee It is no longer possible to define the amount of telecrystals per game mode. 2015-06-18 10:59:45 +02:00
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega
c55f807b42 Removes random Telecrystal grants, instead increases the start amount by 2. 2015-02-23 20:56:48 +01:00
PsiOmega
87998f7eb1 Fixes #7295.
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
PsiOmega
253fcc4551 Uplink Shopping List
At round end players are presented with how which items a given traitor/mercenary team bought, and how much they spent.
2014-10-30 08:49:50 +01:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02:00
PsiOmega
fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
PsiOmega
61d40e2405 Non-random traitor code word assignment. 2014-08-24 12:47:48 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Hubblenaut
736741a5c2 Changes 'Lawyer' to 'Internal Affairs Agent' in restricted job lists 2014-08-16 19:08:22 +02:00
Zuhayr
f2393d9465 Replaces antag intro text and objective announcement with a proc. 2014-07-30 21:36:31 +09:30
mwerezak
cd971fb4ea Fixes a missing config check in autotraitor
Also adds a config check to the various forge_* procs just to be sure.
2014-06-19 00:01:47 -04:00
DJSnapshot
5690e2e4c7 Code cleanup for traitors 2014-02-15 23:42:37 -08:00
DJSnapshot
9c803dc1f6 Added the rest of the objectiveless antag types 2014-02-04 23:51:34 -08:00
DJSnapshot
8813123997 added config flags for objectives being enabled or disabled.
added antag options menu.
added ability to choose where a syndicate uplink is installed.
2013-11-29 17:02:23 -08:00
Erthilo
1a0aaebfc1 "Fixes" law 0. 2013-08-28 01:55:02 +01:00
cib
0bfb43b864 Removed hijack objective. AGAIN. 2013-05-24 00:09:47 +02:00
Chinsky
65d79e6ec1 Fixed runtime in traitor equip. 2013-02-20 08:58:09 +04:00
cib
863a9deb7b Added NT relation preference. 2013-02-09 17:55:53 +01:00
cib
1bdfe2e442 Traitor objectives are now checked regularly.
This doesn't mean the game can end early, it just means certain traitor objectives get a chance to process themselves before the round ended. For instance, the brig objective can now check periodically how long someone's been in the brig.
2012-12-19 22:27:15 +01:00
cib
f633e61f9e Added a harm objective.
Objective is to break a bone, delimb, or disfigure their face.
2012-12-11 16:40:01 +01:00
cib
e218061c5e Added brig objective to traitors. 2012-12-11 15:57:58 +01:00
giacomand@gmail.com
7d6fb8fd6a Commiting for Aranclanos.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10189&p=143580&hilit=https%3A%2F%2Fwww.dropbox.com%2Fs%2Fcwflgm7793ts20s%2FBorgsForCasualsRELOADED.patch#p143580

-Fixed some ugly text in Ion laws "THE STATION IS [0x6006265] FETISHES...LAWS UPDATED".
-Fixed some typos on the Ion laws.
-When borgs are emagged, now they show their laws for themselves.
-When new laws are uploaded, the borg gets instantly the new laws, just like the AI, instead of the confusing message "Your AI has set your 'laws waiting' flag.". Remember this is a patch for casuals.
-The borgs gets the same message than the AI in Ion storms.
-Made the admin Ion storm show the "...LAWS UPDATED" text.
-Borgs get a different law 0 telling them to help their master.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4837 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 05:37:28 +00:00
giacomand@gmail.com
be76c3afcc Fixed issue 645.
I changed how uplinks worked. Instead of there being a duplicate item which would switch out when it activates, there's an item called "obj/item/device/uplink/hidden". It is a hidden uplink which you can place in any obj/item. In "hidden" is where it will generate menus, check for triggers to show the menu and etc.. No need to switch out with duplicate items or add the menu onto the PDA's notes.

How to create a new uplink item in 3 easy steps!

1. All obj/item 's have a hidden_uplink var. By default it's null. Give the item one with "new(src)", it must be in it's contents. Feel free to add/remove "uses".

2. Code in the triggers. Use check_trigger for this, I recommend closing the item's menu with "usr << browse(null, "window=windowname") if it returns true. The var/value is the value that will be compared with the var/target. If they are equal it will activate the menu.

3. If you want the menu to stay until the users locks his uplink, add an active_uplink_check(mob/user as mob) in your interact/attack_hand proc. Then check if it's true, if true return. This will stop the normal menu appearing and will instead show the uplink menu.

I've given the recharge station's verbs a category so they don't create their own tab.
I've added a mob/proc called put_in_any_hand_if_possible. Name speaks for itself. Returns true if successful, false otherwise.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4450 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-16 21:57:27 +00:00
elly1989@rocketmail.com
49a8f89a42 Resolves Issue 766
Fix for colours bleeding over in the end-of-round announcements.
Cause: laziness :3

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4362 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-11 02:02:32 +00:00
elly1989@rocketmail.com
40c2238c24 Minds part 3
Removed mob/var/original_name. Totally replaced by datum/mind/var/name now.

Fixed round-end reports. They're now sort of follow the same format as each-other. Not sure how the ew format will work out on high-pop servers. if it's too spammy I'll tone it down a bit.

Fixed pais. Their life.dm got unticked. Resolves issue 759

Known issues: 
Borgs keep their human objectives when borged. I'll try playing with the way minds work for silicon mobs whe the freeze is over.
No way to edit minds when they are not attached to a mob. Need some sort of debugging tool.
datum/mind/var/mob/living/original isn't realy used for much. I could probably replace it with something more useful.
Changeling stuff is messy. The changeling object should be referenced by the mind not the mob (or something)

Part 4 on hold will try to address some of these known issues. Taking a break from minds to fix some issues on the tracker now (like lighting)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4355 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-09 23:41:01 +00:00
mport2004@gmail.com
c86c8e1505 Finished moving the clothes in defines over to modules.
Several head objects path changed so they are not helmets, head means can fit on your head, helmet was securities helmets, space helmets currently still helmet.
Cult restricted job list now has the sec force + cap because you can’t convert them as is.
AI removed from protected traitor jobs as malf is currently effectively out of commission.
A Protected list was added to changling.
Removed the furry mob files that were not checked.
Moved two unchecked files to unused


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 19:25:01 +00:00
vageyenaman@gmail.com
9d154bbded Reverting traitor.dm because I didn't mean to include it in my previous commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3693 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 03:31:44 +00:00
vageyenaman@gmail.com
49647d329a There's a metric assload of stuff here, mostly in preparation to my massive traitor expansion, so I'll try to be brief:
- I added in the foundations for traitor factions. See factions.dm for all the different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list. Mutation enumerated-identifiers are added into this list. For instance, TK = 1, COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise operations could not actually be used after a certain size (because BYOND is stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under implantnanoaug.dm for a list of implants and implaners. As mentioned previously, they are completely functional but may be slightly OP. Among these nanoaugs are Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer, Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't go into detail as to what they do, but hopefully they should be self-explanitory. If not, check out their descriptions in the file previously mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side sprites because of a technical little issue. I'll change it back to the original soon). It can be retracted and expanded. Probably only going to be given to traitors.

- A couple of minor bugfixes here and there, along with some code tidying.


Hope this isn't too large a commit. I intended it to be MUCH larger, but I've decided to split up my Traitor Factions expansion into smaller commits.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3692 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 03:16:47 +00:00
VivianFoxfoot@gmail.com
6ae0d3018d Adds a option to config.txt called PROTECT_ROLES_FROM_ANTAGONIST.
If PROTECT_ROLES_FROM_ANTAGONIST is set, sec/hos/captain/AI cannot be antagonists in most modes
If it is not set, only jobs that are mutually exclusive to the role (sec/head during rev, etc) are immune from being antagonist

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3225 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 23:30:24 +00:00
petethegoat@gmail.com
bc7517ca42 Removed revhead uplinks! See: http://nanotrasen.com/phpBB3/viewtopic.php?f=15&t=7975
Fixed a couple of spelling errors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3224 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 22:21:47 +00:00
VivianFoxfoot@gmail.com
61c4ff0ed4 Removes thermals from PDA-spawnable stuff
Changes the way people are selected for rounds.  In the case of a insufficient people for a round, all people with it set to 'yes' will be chosen before drafting others.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3218 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 02:40:29 +00:00
musketstgstation@gmail.com
ddc7f45a13 Integrated BS12's improved uplink code, courtesy of SkyMarshal.
This means items now spawn in your hand if possible, items are sorted into categories, and only items you have enough telecrystals to purchase will be displayed.  Also, the same basic code is now used for PDA, headset and nuke-round uplinks, and it should be easier to add new items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3216 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-29 22:50:14 +00:00
baloh.matevz@gmail.com
686350a2df - added feedback logging of wizard, traitor and changeling success as well as individual objectives success.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3131 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-15 12:21:26 +00:00
uporotiy
98ea8045ad Upped noslip shoes cost to 3 - they're situational, but they're very powerful in the situation they're used in and it's not that hard to facilitate.
Captains can't be traitors anymore. This is a placeholder, friday I'll redo that a bit - probably so that captains don't get any traitor equipment (they already have all the everything else for that) and that they can't get steal objectives (re: they already have everything).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2752 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-20 19:22:21 +00:00
baloh.matevz
aa1135eafe - Added some stats logging about round end population and about what method of escape is being used the most.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2672 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-13 02:58:56 +00:00
mport2004@gmail.com
46a7143e3a Energy projectiles work again.
Rewrote the job selection system to use bitflags and the jobs are now objects.
Fixed a path conflict with effect which caused a few things to be unable to be clicked on.
Commented out the job.txt, Urist if you still want it to load from the .txt give me a yell and I can update it to work with the job objects.
Fixed up the bits that were missing the slightly updated mob organ attack code.
Moved the traps file into unused.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2340 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-11 07:52:30 +00:00
mport2004@gmail.com
e95d16da16 Lawyer now has a purple suit and the job has two slots.
Lowered the number of spare jumpsuits in most of the lockers from 6 to 3.
The old arrival message is now back in.
Finished the Ion Rifle and added one to the armory.  Might need to change it up a bit depending on how well it works.
Bullet_act worked on a bit, EMP effects should work now.
Cyborgs are stunned by EMPs.
Raised the changelings required genome number for multichan at the request of Urist. 


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2175 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-11 11:39:44 +00:00