PsiOmegaDelta
3b5990121f
Blobs locations are now more random.
...
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.
Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
GinjaNinja32
c6f328159c
Merge pull request #11286 from PsiOmegaDelta/151013-SillyMistake
...
Antag spawner now uses the starting location list...
2015-10-13 08:04:21 +01:00
PsiOmegaDelta
cfc01d053b
Changes how Topic() calls apply fingerprints.
...
Now applies fingerprints if the user is adjacent to a physical object, otherwise applies a hidden fingerprint.
CouldUseTopic() is only called when a user has successfully interacted with an object interface/UI.
2015-10-13 08:56:20 +02:00
PsiOmegaDelta
f0244bc9e5
Antag spawner now uses the starting location list...
...
..instead of the mob. Someone (might just maybe potentially be me, who knows) cleaned up the code a bit too quickly. Fixes #11284 .
2015-10-13 08:09:12 +02:00
Zuhayr
608c766db2
Merge pull request #11279 from PsiOmegaDelta/151012-Ghostize
...
ghostize() now attempts to set the most relevant time of death.
2015-10-13 08:36:28 +10:30
Zuhayr
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
HarpyEagle
c0dc32d60c
If an antag could not be auto-spawned, the game rechecks in the minimum time.
2015-10-12 13:03:51 -04:00
HarpyEagle
241520f0bb
Cleans up autospawn, now uses existing code for selecting and choosing
...
candidates. Adds more debug messages, and removes unused code.
2015-10-12 13:03:50 -04:00
mwerezak
46f5bbc1d4
Merge pull request #11277 from Hubblenaut/stacks
...
Fixes stack creation logic and return value
2015-10-12 11:25:51 -04:00
Kelenius
741cb2d423
It was bork, I made it not bork
2015-10-12 13:57:47 +03:00
PsiOmegaDelta
7247906f41
ghostize() now attempts to set the most relevant time of death.
...
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229 .
2015-10-12 12:55:34 +02:00
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
e381e2faf2
Fixes do_not_announce parameters not actually doing anything
2015-10-11 12:18:01 -04:00
HarpyEagle
c7afded12d
Cleans up calamity shuffle, makes sure antag types are selected in a random order for other game modes.
2015-10-11 12:18:01 -04:00
HarpyEagle
d715e0645f
Removes unused latejoin template list
2015-10-11 12:02:04 -04: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
97a95c80a1
Department voidsuits can be ordered from cargo
2015-10-11 00:45:39 -04:00
Mark9013100
64ccad7790
Fixes #77
2015-10-11 00:45:27 -04:00
Mark9013100
a2c8e3ee10
Minor edits to the sec lockers
...
Conflicts:
maps/colony-1.dmm
2015-10-11 00:45:22 -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
Datraen
d0bd6b8857
[BUG FIX] Wardrobe
...
Socks are now able to be changed from the wardrobe
2015-10-11 00:40:54 -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
1eab12fc26
Two minor edits to ERT equipment
2015-10-11 00:30:10 -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
Mark9013100
2d709e7862
Flares now spawn in sec lockers
2015-10-11 00:28:47 -04:00
Datraen
6556e57064
[MISC] Increase number of points for gear loadout
...
Explanitory
2015-10-11 00:28:12 -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
6740dea5ad
Update Space Station 13 areas.dm
...
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-10-11 00:26:23 -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
