Mark9013100
93148c27c3
Adds/edits a few cargo crates
2016-01-26 05:04:45 -05:00
Kelenius
138850a37b
Fixes for vendors
2016-01-18 17:40:20 +03:00
Datraen
6df5225059
Adds comments, changelog.
2016-01-03 01:27:44 -05:00
Datraen
37e1913fda
Creates telecrystal item for exchanging telecrystals between antags.
2016-01-03 01:22:48 -05:00
Zuhayr
5313c6b67b
Added Nerf weapons to Cargo. Codersprites.
2015-12-24 22:05:10 +10:30
Zuhayr
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749
Further work on properly integrating, updating and fixing prosthetic options.
...
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
Mark9013100
cbbafa5170
Adds the black scrub cap
2015-12-21 12:25:43 -05:00
Mark9013100
a4b891f5ef
Replaces the standard .45 pistol with the Detective's.
2015-12-20 15:36:26 -05:00
Neerti
8d3cc68771
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/14/2015_communicators_v2
2015-12-14 15:44:38 -05:00
Neerti
3e5436c4b7
Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches.
2015-12-14 15:43:53 -05:00
Neerti
ab66a273e0
Merge pull request #541 from Mark9013100/12/11/2015detbeltandsecedits
...
Adds a detective belt and other edits for security
2015-12-12 23:21:52 -05:00
Yoshax
48dcb85b44
Makes the mythical special blend whiskey real
2015-12-13 03:31:36 +00:00
Mark9013100
09b9be4b72
Adds a detective belt and other edits for security
2015-12-11 22:43:13 -05:00
Datraen
ef0337fccf
Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels.
2015-12-11 21:14:11 -05:00
Neerti
5dbbbaa80b
Merge pull request #456 from Zuhayr/master
...
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
Hubblenaut
a046ad73ca
Fixes backup power test light
2015-12-10 18:07:35 +01:00
Zuhayr
906318d3fc
Compile fixes.
2015-12-10 19:22:15 +10:30
Zuhayr
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
Mark9013100
7e68e3d490
Removes duplicate webbing from webbing crate
2015-12-08 22:16:55 -05:00
Neerti
e379810a07
Kills infinite loop, skins it, then makes a carpet out of it to decorate my imaginary room full of trophies of other bugs I've slain.
...
The infinite loop occured due to the wire datum calling interact() on it's holder, which made it call Interact() on it's wire datum, and so on.
2015-12-07 05:23:38 -05:00
MagmaRam
6c39070a15
Fix for records being a complete mess
...
Because of the limitations of BYOND's bitwise operators (which affect both the
old and new implementations of num2hex()), you can't use numbers larger than 2^16
for this.
I cut the number of digits down to 4 and changed the maximum on the RNG to match.
2015-12-04 22:28:53 -06:00
Mark9013100
6e0b906e23
Adds Security/Medical cargopacks.
2015-12-03 20:22:12 -05:00
Neerti
dc170af54e
Update locations.dm
...
Gets rid of debug verbs.
2015-11-26 11:07:04 -05:00
Neerti
87c54986da
Adds the groundwork to define many, many places in the lore in-game. This could have several applications and help bring the fluff in-game.
...
Places added:
Sol, needs lots of love.
Tau Ceti, needs more love.
Tajara, Skrell, and Unathi home systems. Taj needs to be finished.
Nyx, and Vir.
2015-11-26 10:41:19 -05:00
PsiOmegaDelta
e715c16093
Character setup refactoring.
...
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
(cherry picked from commit e116721977 )
Conflicts:
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
polaris.dme
2015-11-20 07:46:31 -05: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
Chinsky
5acf5f1b7b
Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup
...
Character setup refactor.
2015-10-26 05:44:13 +03:00
PsiOmegaDelta
e116721977
Character setup refactoring.
...
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
2015-10-18 17:34:35 +02:00
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
PsiOmegaDelta
27feb09a31
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/computer.dm
html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/holodeck/HolodeckControl.dm
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-10-11 17:17:41 +02:00
Mark9013100
97a95c80a1
Department voidsuits can be ordered from cargo
2015-10-11 00:45:39 -04:00
Jon
9f2ec9c163
Adds three new hair flower pins - yellow, blue, and pink.
...
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmegaDelta
13b175c529
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
code/game/objects/effects/aliens.dm
code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
Hubblenaut
80cc83dbf8
Fixes backup power test light
2015-10-09 17:44:30 +02:00
Hubblenaut
a7cad04264
Amendments to light replacer and janitor supply crate
2015-10-06 19:59:56 +02:00
PsiOmegaDelta
8eee143177
Merge remote-tracking branch 'upstream/dev' into xenomorphs
...
Conflicts:
baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmegaDelta
9dd1a54191
Destroy tweaks.
...
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091 .
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
Zuhayr
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
GinjaNinja32
be2279106f
Merge remote-tracking branch 'upstream/dev' into vv
...
Conflicts:
code/modules/admin/verbs/debug.dm
code/modules/admin/view_variables/topic.dm
2015-09-10 03:06:27 +01:00
Zuhayr
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
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
Chinsky
7d123549ed
Merge pull request #10845 from PsiOmegaDelta/150824-Cargonia
...
Cargo now sorts under their own department in manifests.
2015-09-03 20:38:00 +03:00
PsiOmega
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
PsiOmegaDelta
d36d6d42e0
Cargo now sorts under their own department in the manifests.
2015-08-24 10:03:15 +02:00
Neerti
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