53cbd2bbe0
Alters the secret player requirements for various game modes:
...
https://docs.google.com/document/d/1oCuSNmWOhNOzGk9AHmZeVhFPX9Qr0LHSqyxH7ocaXD0/edit
2015-11-28 23:08:11 +00:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
3fd172ee63
Merge pull request #11294 from Baystation12/master
...
Dev-freeze
2015-10-14 08:40:03 +02:00
a19829e968
Merge pull request #11289 from Kearel/secRemoveMaster
...
Pointed secret changes to master
2015-10-13 20:27:56 +02:00
78956843a8
Pointed secret changes to master
...
New gamemodes on dev will still need to be changed.
2015-10-13 12:30:52 -05:00
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
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
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
1d736b368e
Rounds no longer end on antag death
2015-08-30 00:52:38 -04:00
99ba26f1ee
It is no longer possible to define the amount of telecrystals per game mode.
2015-06-18 10:59:45 +02:00
de4f085057
code/game, excluding code/game/machinery and code/game/objects
2015-05-29 21:51:27 +01:00
4ba4bd8dd3
Replaces nuke disk search_contents_for with a global nuke disk registry
2015-05-22 01:15:04 -04:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
b995c856a9
Merge pull request #7924 from Kelenius/ofTablesAndPass
...
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
fbabdce615
Finished renaming nuclear mode to mercenary
...
Mostly cleans up the admin side of things.
2015-01-27 13:42:27 +13:00
47157a20be
Fixed mercenary game mode announcement
2015-01-26 17:57:34 +13:00
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
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
117ca6a135
refactor 'dir = ' into 'set_dir()'
...
This should have little/no gameplay effect right now, just paving the
way for directional lights.
Replaced handle_rotation() on buckly things with this.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-01 13:44:02 +00:00
4d64a11acd
Manual merge of head.dmi.
2014-11-14 23:02:16 +10:30
ebbb9b36b5
Moved everything to a module-based hardsuit system.
...
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
7c284141b8
Merge pull request #6891 from PsiOmegaDelta/Z
...
Multi Z-Level Compatibility
2014-11-01 02:18:23 +03:00
bf1e6af508
Z-Level Compatibility
...
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
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
99ff852e46
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-19 16:05:40 +10:30
37cb78eefa
Fixes #6613 and #6492
2014-10-08 23:10:12 +10:30
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
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
a10b7284e5
Fixes nuke-op radios not having freerange set
2014-09-17 16:02:32 +02:00
1b1505153e
Fixes Nuke-ops spawning with unwanted items
2014-09-17 14:15:26 +02:00
f2393d9465
Replaces antag intro text and objective announcement with a proc.
2014-07-30 21:36:31 +09:30
3105297f3e
Adjusted spawn procs for heist and nuke.
2014-07-30 21:08:28 +09:30
4ee6b77289
Adds new syndicate closet and adjusts nuke setup
2014-07-15 17:22:03 +02:00
fbd8d48532
Rigs spawn in backpack, uplink spawns without locker, code spawns at special spawnpoint
2014-07-15 17:21:52 +02:00
a6f64ccd9c
Merge pull request #5330 from mwerezak/emergency-shuttle
...
Updates emergency shuttle controller to use shuttle datums
2014-06-23 21:19:36 +09:30
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
dd7f0dac0e
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/card.dm
code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
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
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
7a56a174dc
Converted Syndicate shuttle over to multi-shuttle setup.
2014-06-04 00:08:10 +09:30
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
eb23c44c8a
Removes explosive implants from nuke ops
2014-06-01 20:15:39 +02:00
Jon