Commit Graph
5176 Commits
Author SHA1 Message Date
PsiOmegaDelta 299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
ccomp5950 bb93245ccd Fixes the tapping messages check.
The check is now in Topic() instead of being based on the href link sent.

Resolves #11039
2015-10-15 21:11:06 -04:00
Chinsky 2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision
Overhauls humanoid vision handling.
2015-10-15 19:15:28 +03:00
PsiOmegaDelta e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta fd03e4d59b Surgical kits can now contain their equipment.
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
2015-10-15 10:20:49 +02:00
PsiOmegaDelta 3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta 3fd172ee63 Merge pull request #11294 from Baystation12/master
Dev-freeze
2015-10-14 08:40:03 +02:00
mwerezak f245e41db2 Merge pull request #11287 from PsiOmegaDelta/151013-TopicFingerprints
Changes how Topic() calls apply fingerprints.
2015-10-13 22:11:26 -04:00
Chinsky 8c8b5a34d3 Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob
Blob spawn locations are now more random
2015-10-14 03:24:28 +03:00
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
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
Zuhayr 5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs
Xenomorph update
2015-10-13 08:31:27 +10:30
Hubblenaut 1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02: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
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
Chinsky debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer
Fixes #11263.
2015-10-10 17:51:15 +03: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 6c3bbb9ee8 Updates changelog, fixes comment 2015-10-09 11:39:22 -04:00
HarpyEagle 63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
GinjaNinja32 ace1874f37 Merge pull request #11241 from Hubblenaut/light_replacer
Amendments to light replacer
2015-10-09 11:35:13 +01:00
HarpyEagle fa661f998f TTV Refactor
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
2015-10-08 23:26:05 -04:00
PsiOmegaDelta bd7c475fcc Stack material use now depends on charge costs.
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
2015-10-08 20:29:39 +02:00
PsiOmegaDelta 8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo
Updates blob
2015-10-08 07:58:15 +02: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
Hubblenaut a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +02:00
Kelenius 83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
Zuhayr e8196675e0 Merge pull request #11228 from Vivalas/dev
Adds in AcmeCo brand explosive cigarettes.
2015-10-06 00:42:43 +10:30
PsiOmegaDelta f3175becc0 Overhauls humanoid vision handling.
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
2015-10-05 08:48:47 +02:00
Vivalas 0bf5145e24 Name change 2015-10-01 13:35:26 -05:00
PsiOmegaDelta a3a1f495a3 Implements my own comment suggestions and updates Travis' macro count. 2015-10-01 09:56:30 +02:00
PsiOmegaDelta 8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	baystation12.dme
2015-10-01 09:48:51 +02:00
Vivalas d2c355a937 Adds in KillerKickthroats 2015-09-30 17:56:35 -05:00
Vivalas 8b6650d217 Briefcase Fix 2015-09-30 17:10:57 -05:00
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
mwerezak 03cb79a85d Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
Destroy tweaks.
2015-09-26 20:22:01 -05:00
mwerezak 21f679ea8f Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity
Makes more sources of radiation respect rad-protection.
2015-09-26 20:10:47 -05:00
Joseph Heinemeyer 9e9df0a15d Delete ladders.dm 2015-09-26 17:43:52 -07:00
Hubblenaut f0481b551e Fixes grab-buckling overwriting pixelshift 2015-09-26 14:11:01 +02:00
PsiOmega a3b9ab1236 Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection. 2015-09-26 09:19:58 +02:00
Chinsky dbbf6bb11e Merge pull request #11158 from PsiOmegaDelta/150920-MoreGlow
Glowy items.
2015-09-25 15:03:39 +03:00
Chinsky 407f5bbac3 Merge pull request #11182 from Hubblenaut/dev
Lowers the belt layer to below suit
2015-09-25 11:45:57 +03: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
Hubblenaut 8d3519e24b Belt layer below suit layer, belts toggleable 2015-09-24 17:48:14 +02:00
Chinsky 60a925422f Merge pull request #11167 from PsiOmegaDelta/150921-ColorCleanup
Floor painter, turf, and decal tweaks.
2015-09-24 15:27:58 +03:00
PsiOmega de2e9e2d9a Odd typo fixes. 2015-09-21 20:31:47 +02:00