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
2563821832
Merge pull request #10972 from Zuhayr/resomi
...
Adds the Resomi.
2015-09-06 13:09:34 +03:00
ef21f562fd
Added some Resomi uniforms/loadout options.
2015-09-06 18:49:33 +09:30
63cb207eb8
Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
...
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
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
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
12a5c47413
Added a proper cooldown on latespawn, added loyalist role to char setup.
2015-09-05 10:46:23 +09:30
0a355c84a3
Added species checks for robolimb use.
2015-09-04 08:55:27 +09:30
5873026915
Adds missing message assignment. Removes now unnecessary message formatting.
2015-08-27 19:35:44 +02:00
85f32efa7a
Players can now select their own language shortcut keys.
2015-08-26 15:15:54 +02:00
5962656c1e
Languages now use alternative prefix keys.
...
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
2015-08-26 13:17:57 +02:00
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
30babe48c3
Adds medical scrubs to custom loadout
2015-08-20 19:34:35 -04:00
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
11eefbc4c9
Merge pull request #9856 from Hubblenaut/dev
...
Beret Resprites
2015-08-19 17:56:37 -04:00
a9773207b2
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-19 09:42:48 +01:00
651c2c6ba6
Species spawn_flags
...
Moves some more species flags into a new spawn_flags var.
2015-08-18 17:02:45 -04:00
8a9caac7cc
Splits species flags
...
Splits several species flags off into a separate appearance_flags var, to avoid rollover.
2015-08-18 17:02:44 -04:00
0d9ef708d5
Merge pull request #9905 from GinjaNinja32/jumpskirt
...
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-08-18 16:55:47 -04:00
1957029890
HUD cleanup, human/monkey HUD now turns correctly with client.dir
2015-08-18 18:21:25 +01:00
0e4c2430d1
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-18 11:59:50 -07:00
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
f0c8db3d0f
Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs
2015-08-18 02:16:50 +01:00
d2e2574f07
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-16 20:39:50 +02:00
c63f4c62b5
Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney
...
Conflicts:
code/__defines/mobs.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job_controller.dm
2015-08-13 08:06:11 +02:00
38f711b7c6
Merge remote-tracking branch 'upstream/dev' into jumpskirt
2015-08-13 05:39:27 +01:00
f7ccf47f06
Merge pull request #10030 from GinjaNinja32/languages
...
Reworks character creation language selection
2015-08-13 07:23:44 +03:00
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
27296e7caf
Update preferences_gear.dm
2015-08-12 12:13:28 -05:00
242c9444ef
Forces hardware acceleration.
...
Most likely also fixes the hickup where BYOND still rending lights are blobs of light despite having hardware acceleration enabled.
Ports https://github.com/ParadiseSS13/Paradise/pull/1690 . Fixes #10147 as much as it can be fixed I believe.
2015-08-11 21:47:07 +02:00
3fb52ab4d5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-08-11 00:51:18 +02:00
17b6d4e3c7
Sec soft cap sprite improvements & ERT rig pathfile
2015-08-08 08:40:56 -04:00
b601310f9b
Men in black
2015-08-08 06:01:35 -04:00
f8d86900a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
code/setup.dm
2015-08-01 19:45:42 +02:00
f04ca77bfb
revert chargen rendering rework
...
fixes #9733
Signed-off-by: Mloc <colmohici@gmail.com >
2015-08-01 11:35:53 +01:00
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
5e1ae26b74
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
2015-07-14 05:19:01 +09:30
64da8265a9
Attempts to fix old character save files in a slightly nicer way. Should mean there's no difference with converted characters, but you never know.
2015-07-11 23:24:56 +01:00
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
57bdcf43b6
Reworks character creation language selection
2015-07-06 10:07:35 +01:00
944b167e10
Removes a qdel(client) call.
...
Clients are not subtypes of datums. The garbage collector does not like this.
2015-07-05 21:01:09 +02:00
f96ad8ca40
NTs relationship towards you now affects the pay grade.
2015-07-02 23:03:55 +02:00
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
5906ae7556
Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors
2015-06-25 22:52:36 +01:00
1fc147088d
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-06-23 17:28:23 +01:00
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
1a6ea56194
Fixes the Changelog menu button.
...
It had lost the ability to go bold upon detected unread changelog entries.
2015-06-21 13:39:26 +02:00
5a026b1553
Overhauls berets, adds corporate black
2015-06-18 18:10:35 +02:00
Neerti