Werner and skull132
a0078b9aed
Tajara Subspecies ( #1300 )
...
Two subspecies for tajara as requested by the lore dev.
2016-12-26 17:13:23 +02:00
Alberyk and skull132
871b2dc302
Unathi alt language and more fixes ( #1299 )
...
-added an alt unathi language, at jackboot's request
-added an automatic shotgun weapon
-fixed rifles having the wrong delay when not wielded
-fixed non-lore friendly ipc limbs
-fixed #1292
-fix syndicate borgs not having the right assigned mind
2016-12-25 20:51:15 +02:00
Werner and skull132
5df9509435
Computer tweaks ( #1285 )
...
Pulling in some computer changes from bay.
2016-12-25 14:19:50 +02:00
LordFowl and skull132
93143a8e45
Vaurca Update Dec2016 ( #1289 )
...
Adds Vaurca subspecies and a whole slew of content related to them. Also, custom organs for them.
2016-12-25 01:11:09 +02:00
Alberyk and skull132
b247ba78a4
Adding socks ( #1284 )
...
The long waited sock update;
Socks are being added as another underwear like option, with some exclusive ones for females. Only humans (and squish) can have them atm.
Also, I am nearly sure this will work.
2016-12-24 04:28:43 +02:00
LordFowl and skull132
51bd200d7c
Porting Apollo Infractions Computer ( #1033 )
...
Ports Apollo's infraction's system, creating a permanent criminal record for every character. Every minor or medium infraction accrued over the course of a round is added to the character's permanent security record which is available at vanilla records councils. Antagonists are automatically exempt from this process, and players can exercise control over what charges they consider canon or not.
Brigging a person is now dependent on the criminal sentencing computer, which reads a person's ID and applies a brig timer automatically for the charges selected. Personnel without ID's will have to be brigged manually.
2016-12-23 01:00:04 +02:00
NanakoAC and skull132
e221a91049
Nutrition fixes and tweaks ( #1265 )
...
Fixes nutrition displays not updating.
Adds code support for species-variable levels of max nutrition storage, and nutrition loss. No actual variations are yet implemented, awaiting input from lore team.
Fixes all relevant static isntances of numeric literals with the max_nutrition variable
And a feature tweak: Players will now spawn with randomised nutrition levels when they join
2016-12-22 18:13:00 +02:00
Alberyk and skull132
89ae849adc
Bay merge fixes ( #1225 )
...
What is being fixed:
-messed up sec armor
-skeleton, vox and resomi being player species
-abhumans also had restrictions added until whatever should be done with them was decided or something
-fixing dionae language name
-fixing bluespace suicide and some additions/changes
-fixing random vaurca name gen thing
-fixing missing ipc chest and groin sprites
-added missing resomi hair and some new dank vox hair styles
2016-12-18 10:52:16 +02:00
NanakoAC and skull132
a20576ce1d
Dview fixes ( #19 )
...
Centralises the dview code and defines in one file
Removes the proc version of dview, as it was unused
Fixes three compile errors with offset lighting code
2016-11-21 12:57:34 +02:00
NanakoAC and skull132
92d442b9f0
Fixes some issues and reverts some changes to cyborgs ( #14 )
...
Removed cyborg RCD upgrade
Fixed tox mod
Fixed four sound pref defines
2016-11-19 18:54:51 +02:00
Werner and skull132
ab413348ff
Baymerge fixes ( #12 )
...
* Fixing compile errors
* Some more fixes
* Some more fixes
2016-11-19 11:56:49 +02:00
Werner and skull132
3e92d63ddf
Fixing compile errors ( #9 )
2016-11-18 18:03:27 +02:00
skull132
effb9ececf
Processor defines & whitelist fix
...
Removed the inefficient Bay method of handling ayylmao whitelists.
2016-11-12 14:31:09 +02:00
skull132
f75e1f3cca
Indentation clearance + basic compiles
...
Due to missing includes, primarily.
2016-11-12 01:02:50 +02:00
skull132
e9b688e1f6
Merge branch 'development-2' into development
...
Christ on a stick. SO MANY ERRORS. REEE.
# Conflicts:
# baystation12.dme
# code/_helpers/lists.dm
# code/_helpers/logging.dm
# code/_helpers/text.dm
# code/_onclick/click.dm
# code/controllers/configuration.dm
# code/controllers/master_controller.dm
# code/datums/supplypacks.dm
# code/game/antagonist/antagonist.dm
# code/game/antagonist/antagonist_print.dm
# code/game/antagonist/outsider/commando.dm
# code/game/antagonist/outsider/ninja.dm
# code/game/area/areas.dm
# code/game/gamemodes/cult/cult_items.dm
# code/game/gamemodes/game_mode.dm
# code/game/jobs/access.dm
# code/game/machinery/atmoalter/canister.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/mecha/mech_fabricator.dm
# code/game/mecha/mecha.dm
# code/game/objects/effects/spiders.dm
# code/game/objects/items.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/flash.dm
# code/game/objects/items/devices/lightreplacer.dm
# code/game/objects/items/devices/paicard.dm
# code/game/objects/items/devices/scanners.dm
# code/game/objects/items/devices/suit_cooling.dm
# code/game/objects/items/devices/uplink.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/toys.dm
# code/game/objects/items/weapons/cards_ids.dm
# code/game/objects/items/weapons/handcuffs.dm
# code/game/objects/items/weapons/manuals.dm
# code/game/objects/items/weapons/material/kitchen.dm
# code/game/objects/items/weapons/material/misc.dm
# code/game/objects/items/weapons/material/swords.dm
# code/game/objects/items/weapons/melee/energy.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/scrolls.dm
# code/game/objects/items/weapons/storage/belt.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/tools.dm
# code/game/objects/objs.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/janicart.dm
# code/game/sound.dm
# code/game/turfs/simulated.dm
# code/game/verbs/ooc.dm
# code/global.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/verbs/modifyvariables.dm
# code/modules/client/client procs.dm
# code/modules/client/preferences.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/head/hardhat.dm
# code/modules/clothing/head/helmet.dm
# code/modules/clothing/head/jobs.dm
# code/modules/clothing/head/misc_special.dm
# code/modules/clothing/shoes/jobs.dm
# code/modules/clothing/spacesuits/alien.dm
# code/modules/clothing/spacesuits/captain.dm
# code/modules/clothing/spacesuits/miscellaneous.dm
# code/modules/clothing/spacesuits/rig/rig_pieces.dm
# code/modules/clothing/spacesuits/rig/suits/alien.dm
# code/modules/clothing/spacesuits/spacesuits.dm
# code/modules/clothing/spacesuits/void/merc.dm
# code/modules/clothing/spacesuits/void/void.dm
# code/modules/clothing/suits/armor.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/clothing/suits/storage.dm
# code/modules/clothing/suits/utility.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/clothing/under/jobs/security.dm
# code/modules/economy/Events.dm
# code/modules/economy/Events_Mundane.dm
# code/modules/economy/economy_misc.dm
# code/modules/events/blob.dm
# code/modules/events/event.dm
# code/modules/events/event_container.dm
# code/modules/events/event_manager.dm
# code/modules/events/money_lotto.dm
# code/modules/events/prison_break.dm
# code/modules/events/spacevine.dm
# code/modules/hydroponics/trays/tray.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/emote.dm
# code/modules/mob/holder.dm
# code/modules/mob/language/station.dm
# code/modules/mob/living/bot/cleanbot.dm
# code/modules/mob/living/carbon/alien/diona/diona.dm
# code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
# code/modules/mob/living/carbon/give.dm
# code/modules/mob/living/carbon/human/emote.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/inventory.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/outsider/vox.dm
# code/modules/mob/living/carbon/human/species/station/golem.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/carbon/metroid/metroid.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defense.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/admin.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/drone/drone.dm
# code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
# code/modules/mob/living/silicon/robot/emote.dm
# code/modules/mob/living/silicon/robot/robot_items.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# code/modules/mob/living/silicon/silicon.dm
# code/modules/mob/living/simple_animal/bees.dm
# code/modules/mob/living/simple_animal/friendly/cat.dm
# code/modules/mob/living/simple_animal/friendly/corgi.dm
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# code/modules/mob/living/simple_animal/friendly/mouse.dm
# code/modules/mob/living/simple_animal/friendly/spiderbot.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob.dm
# code/modules/mob/mob_grab_specials.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_alien.dm
# code/modules/organs/organ_external.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/ammunition/boxes.dm
# code/modules/projectiles/ammunition/bullets.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/guns/energy/rifle.dm
# code/modules/projectiles/guns/energy/special.dm
# code/modules/projectiles/guns/projectile.dm
# code/modules/projectiles/guns/projectile/automatic.dm
# code/modules/projectiles/guns/projectile/pistol.dm
# code/modules/projectiles/guns/projectile/revolver.dm
# code/modules/projectiles/guns/projectile/shotgun.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/projectiles/projectile/special.dm
# code/modules/reagents/reagent_containers.dm
# code/modules/reagents/reagent_containers/food/drinks.dm
# code/modules/research/designs.dm
# code/modules/research/destructive_analyzer.dm
# code/modules/research/rdconsole.dm
# code/modules/spells/artifacts.dm
# code/modules/spells/spellbook.dm
# code/modules/tables/tables.dm
# code/world.dm
# config/example/config.txt
# icons/mob/items_lefthand.dmi
# icons/mob/items_righthand.dmi
# icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
skull132
31620ed3a8
More conflict clearance!
2016-10-07 01:13:36 +03:00
skull132
1910f487af
Conflict clearance, vol deux.
2016-10-07 00:59:00 +03:00
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
skull132 and GitHub
d07b0f4be6
Optimizing REGEX, fixes #686 ( #677 )
...
Less vars instanced every time someone speaks, no more REGEX being compiled every time someone speaks.
Should lower the cost of these procs.
2016-08-06 00:48:51 +03:00
skull132 and GitHub
02b42862c1
processScheduler Update to 510 ( #398 )
...
Updates code to be 510 compile compatible.
Also introduces the new updates to the GOON processScheduler, which should make for better gameplay and less lag. Specially on high population.
2016-06-23 02:47:12 +03:00
Ccomp5950
6cf7cbd933
Merge pull request #11988 from PsiOmegaDelta/160115-IAmALittleBitSpecial(InTheHead)
...
Makes special role preferences a list, instead of flag entry.
2016-02-02 15:26:09 -05:00
Daranz
c5aaa9be31
Replace gluttonous magic numbers with defines
2016-02-01 04:31:00 +13:00
PsiOmegaDelta
654f2ccaa0
Makes all special role entries use unique ids now that it is possible.
2016-01-30 17:22:17 +01:00
PsiOmegaDelta
b74f2baf6d
Makes special role preferences a list, instead of flag entry.
...
Allows us to define more than 16 special roles.
Updates some role usages to use the new ghost trap system.
2016-01-15 11:34:00 +01:00
Chinsky
d2940ce1f6
Merge pull request #11808 from Ccomp5950/unit_tests
...
Unit Tests Framework
2016-01-06 07:38:50 +03:00
Ccomp5950
7dc9b3487a
Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
...
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
ccomp5950
6633fb4e08
Unit Tests
...
Adds an example, edits Travis to run them.
2015-12-31 11:18:15 -05:00
PsiOmegaDelta
6ff99e2bd7
Door bolt lights and alarming emergency shutters now glow.
2015-12-30 20:32:14 +01:00
Atlantis
605b78d377
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2
2015-12-29 20:25:34 +01:00
PsiOmegaDelta
91dbf027d0
Synths can now speak EAL.
2015-12-28 20:53:31 +01:00
PsiOmegaDelta
4d83861b85
Synths can now understand the language of the resomi.
...
Fixes #11778 .
2015-12-28 20:15:17 +01:00
PsiOmegaDelta
f6eec096e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_onclick/click.dm
code/game/objects/items/weapons/material/kitchen.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-12-20 11:55:53 +01:00
Hubblenaut and PsiOmegaDelta
56d8975a19
Tweaks Filtering and Toxic Gases
2015-12-17 17:50:30 +01:00
Chinsky
8413d7bd20
Merge pull request #11682 from Zuhayr/guns
...
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Zuhayr
1ab263f662
Rewrote targeting.
2015-12-16 10:10:13 +10:30
PsiOmegaDelta
1a8fc50f1e
Removes suicide code.
2015-12-14 15:57:56 +01:00
PsiOmegaDelta
bbe65baf5c
Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape
...
Conflicts:
code/__defines/misc.dm
2015-12-13 11:50:06 +01:00
PsiOmegaDelta
12078c48e9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/mobs.dm
code/game/asteroid.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
PsiOmegaDelta
b31a5ba836
Compilation fixes.
2015-12-13 10:21:00 +01:00
Chinsky
36803747a2
Merge pull request #11445 from Kearel/fluff2
...
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03:00
Chinsky
21f8c4aef1
Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow
...
Now possible to change cable coil color using a multitool.
2015-12-12 02:54:49 +03:00
PsiOmegaDelta
a29bbc28c0
Cargo tugs now uses a more finally grained incapacitation check.
2015-12-11 13:48:18 +01:00
PsiOmegaDelta
6ab585fbf2
Adds research and medical tape.
...
To cordon dig sites, major medical incident areas, etc.
2015-12-11 08:45:55 +01:00
PsiOmegaDelta
d43cf313c0
Relocates color definitions. Lowercases color definitions.
2015-12-09 21:49:58 +01:00
Kearel
7b2b658644
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2
2015-12-07 11:43:51 -06:00
PsiOmegaDelta
b89e19e5a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev.
...
Conflicts:
code/datums/datacore.dm
code/defines/procs/records.dm
code/game/machinery/camera/camera_assembly.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/mob/language/station.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/surgery/organs_internal.dm
html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
Kearel
caa0fbaea5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2
2015-12-05 12:47:03 -06:00
Chinsky
939c1a3146
Merge pull request #11376 from NullSnapshot/dev-freeze
...
Bunch of IPC fixes.
2015-12-04 11:28:25 +03:00
Zuhayr and NullSnapshot
fd59c3ad76
More tweaks to IPC fixes.
2015-12-03 22:56:19 -08:00
Zuhayr and NullSnapshot
5561964204
Tweaks to previous commits.
2015-12-03 22:56:19 -08:00
