Jon
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
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
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
PsiOmegaDelta
3fd28dd361
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
a19829e968
Merge pull request #11289 from Kearel/secRemoveMaster
...
Pointed secret changes to master
2015-10-13 20:27:56 +02:00
Kearel
78956843a8
Pointed secret changes to master
...
New gamemodes on dev will still need to be changed.
2015-10-13 12:30:52 -05:00
Neerti
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
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
Neerti
b93595c19f
Merge branch 'master' into 9/4/2015_master_to_dev
...
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
2015-09-04 08:43:37 -04:00
Zuhayr
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
Mark9013100
1d736b368e
Rounds no longer end on antag death
2015-08-30 00:52:38 -04:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
57c0591283
Fixes ninja spawn logic.
...
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
PsiOmega
958391d06b
Custom ninja spawn points.
...
The ninja should no longer risk spawning far away from the station, with no clue where to go to reach it.
2015-02-18 08:14:40 +01:00
Zuhayr
2c82daa594
Fixes #7599
2015-01-03 06:30:43 +10:30
Zuhayr
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
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
9c803dc1f6
Added the rest of the objectiveless antag types
2014-02-04 23:51:34 -08:00
Zuhayr
b2da52098a
Removing my debug changes.
2014-01-09 13:07:02 +10:30
Zuhayr
68499b4ae2
Fixes #4151
2014-01-09 12:57:27 +10:30
Zuhayr
ee6a69e35d
Fixes #3248
2013-11-23 00:57:40 +10:30
Zuhayr
bf44db3393
Due to total absence of ninja spawn points, using carpspawn directly.
2013-11-23 00:39:43 +10:30
Whitellama
99a317cf07
Removed debug outputs
2013-06-30 20:08:46 -07:00
Whitellama
f9b01a09cc
Removed debug outputs and fixed double-forging of ninja objectives
2013-06-27 18:52:00 -07:00
Whitellama
ca74c8ab44
Raised required players of ninja gamemode (no longer 1, for debug)
2013-06-26 17:08:08 -07:00
Whitellama
90eaca1e53
WIP Ninja GM junk
2013-06-26 16:30:24 -07:00
Whitellama
bf953679c7
No more placeholder antags, and WIP space ninja gamemode stuff
2013-06-25 16:49:53 -07:00
Whitellama
424c9a0161
Space Ninja Gamemode Implementation
2013-06-22 00:19:32 -07:00
Whitellama
d23b758006
WIP: Implementing space ninja gamemode
2013-06-15 16:09:23 -07:00