GinjaNinja32
de68e366f5
Merge pull request #11270 from Hubblenaut/master
...
Flavor Text Bugfix
2015-10-11 23:55:10 +01:00
Hubblenaut
1c8ec1a700
Fixes stack creation logic and return value
2015-10-11 22:02:05 +02:00
HarpyEagle
43d5f2e3bd
Ensures leftover candidates and pending antags are cleared after finalizing
2015-10-11 11:39:26 -04:00
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
38c6ba3a07
Code relocation.
2015-10-11 17:31:21 +02:00
HarpyEagle
dec0629fae
Renames latespawn() to be less confusing
2015-10-11 11:26:24 -04: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
Neerti
7571ba8c4b
Think I'm done.
2015-10-11 01:16:25 -04:00
SinTwo
ec58f7c705
TG_Port
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/modules/clothing/head/helmet.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/clothing/under/accessories/accessory.dm
code/modules/mob/new_player/sprite_accessories.dm
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/mask.dmi
icons/obj/clothing/hats.dmi
polaris.dme
2015-10-11 00:58:26 -04:00
Neerti
24d9545790
Headset/shield issues.
2015-10-11 00:54:01 -04:00
Mark9013100
ce4b21550a
Edits the Z8, L6, and A12
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:44:47 -04:00
Mark9013100
0714ce3f93
Update automatic.dm
2015-10-11 00:44:22 -04:00
Mark9013100
fa361890ff
Minor change to the auto shotgun and SAW
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/obj/rig_modules.dmi
2015-10-11 00:44:18 -04:00
Mark9013100
488ebc89b2
Balances fm-t2, nerfs burstfire
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-10-11 00:42:26 -04:00
Mark9013100
1273a51f83
Merges f-card box and evidence bag box
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
2015-10-11 00:41:46 -04:00
Mark9013100
080e526e9e
Fixes an issue with helmet visors
2015-10-11 00:40:11 -04:00
Mark9013100
fb1134a24b
Changes several helmets, fixes shields
...
Conflicts:
code/game/objects/items/devices/radio/headset.dm
code/game/objects/items/weapons/shields.dm
code/modules/clothing/head/helmet.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-10-11 00:39:38 -04:00
SinTwo
4129b95f4e
TG_PORT_fix 2
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/modules/clothing/suits/miscellaneous.dm
2015-10-11 00:36:50 -04:00
SinTwo
a2b24d64b7
TG_Port_2
...
Conflicts:
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
code/modules/client/preferences_gear.dm
code/modules/clothing/under/accessories/accessory.dm
2015-10-11 00:36:13 -04:00
SinTwo
8eac3f8b9b
TG Port
2015-10-11 00:33:44 -04:00
Mark9013100
3cc7a77846
The detective colt can now be reskinned
...
Conflicts:
code/modules/projectiles/guns/projectile/pistol.dm
2015-10-11 00:30:06 -04:00
Datraen
7856ca948d
[BOTANY] Seed Fixes
...
Fixes seed storage, adds gas scanning properties to scanner
2015-10-11 00:27:49 -04:00
Jon
de2ee16588
Fixes issues with incorrect loadout ids
2015-10-11 00:26:57 -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
2cc8dbbe18
Fixes savefile issue.
2015-10-11 00:24:48 -04:00
Neerti
bbe8c336b2
Adds socks.
...
Conflicts:
code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -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
Chinsky
debe69aa80
Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer
...
Fixes #11263 .
2015-10-10 17:51:15 +03:00
Hubblenaut
d3572bf4cb
Fixes empty flavor text drawing two spaces
2015-10-10 15:55:25 +02: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
PsiOmegaDelta
fd3370c01f
Fixes #11263 .
...
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263 .
2015-10-10 10:11:48 +02:00
GinjaNinja32
d5928d9927
Merge pull request #11260 from mwerezak/ttv
...
Fixes TTV Yield
2015-10-10 09:05:00 +01:00
HarpyEagle
fa86509daf
Readds organ damage from failing to mend ribs
2015-10-09 18:57:17 -04:00
HarpyEagle
5684befee2
Fixes #11262
2015-10-09 18:57:17 -04:00
HarpyEagle
63838b01d4
Updates preset TTV bombs, adds debug verb
2015-10-09 11:18:12 -04:00
PsiOmegaDelta
e237e33030
Merge pull request #11259 from mwerezak/rubber-bullets
...
Rubber bullets and beanbags now check melee armour instead of bullet armour
2015-10-09 12:42:44 +02:00
PsiOmegaDelta
4ca487e291
Merge pull request #10113 from mwerezak/wheredoesthepowercomefrom
...
Makes newly fabricated power cells start uncharged
2015-10-09 12:42:22 +02:00
GinjaNinja32
1f1857cc0a
Merge pull request #11257 from Karolis2011/map_capture
...
Added more help/error messages to the capture tool.
2015-10-09 11:35:54 +01:00
HarpyEagle
40ab99b354
Rubber bullets and beanbags now check melee armour instead of bullet armour
2015-10-08 16:36:51 -04:00
HarpyEagle
38775120d7
Updates mechfab
...
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
2015-10-08 16:03:32 -04:00
mwerezak
83df0fa8f8
Makes powercells produced by the protolathe start uncharged.
2015-10-08 15:10:51 -04:00
Karolis2011
fad0e0b28a
Added more help/error messages to the tool.
2015-10-08 12:36:09 +03:00
PsiOmegaDelta
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
Kelenius
82928d3b74
Fixes a minor blob issue, adds mecha attack message
2015-10-07 10:49:24 +03:00
PsiOmegaDelta
55c9f7533b
Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name.
2015-10-07 08:56:13 +02:00
PsiOmegaDelta
aaba2c5c8c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
Chinsky
8107786cbd
Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech
...
Makes silicon language handling more robust.
2015-10-06 19:32:54 +03:00
PsiOmegaDelta
019c147bdc
HUD element positioning.
...
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).
Port of https://github.com/d3athrow/vgstation13/pull/5984 .
2015-10-06 12:51:03 +02:00
HarpyEagle
74950268d7
Fixes fire_stacks update logic
2015-10-05 19:24:33 -04:00
